From 85aa8796205e89962eb1f9b733daa1ec8cbc34d9 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Fri, 10 Oct 2014 22:56:34 +0000
Subject: [PATCH] Tweaks to make install work in linux.

---
 .gitignore                 |  4 +++-
 resources/requirements.txt | 11 ++++++++---
 tasks/__init__.py          |  1 +
 tasks/linux.py             | 13 ++++++++++++-
 tasks/osx.py               |  2 +-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d1ce340b..727e3569 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,6 @@ dotfiles/vim/bundle/*
 dotfiles/vim/.netrwhist
 dotfiles/sbt/0.13/plugins/project/
 dotfiles/sbt/0.13/plugins/target/
-dotfiles/sbt/boot/
\ No newline at end of file
+dotfiles/sbt/boot/
+dotfiles/.pip/download_cache
+dotfiles/.pip/pip.log
\ No newline at end of file
diff --git a/resources/requirements.txt b/resources/requirements.txt
index 7abd1edb..5fc145ec 100644
--- a/resources/requirements.txt
+++ b/resources/requirements.txt
@@ -1,9 +1,14 @@
-Flask
+py
+tox
+sqlalchemy
 ddg
 ouimeaux
-readline
 simplejson
-tox
 invoke
+lxml
 okcupyd
+vcrpy
+dotfiles
 numpy
+readline
+Flask
diff --git a/tasks/__init__.py b/tasks/__init__.py
index ed296561..8914c0c7 100644
--- a/tasks/__init__.py
+++ b/tasks/__init__.py
@@ -38,6 +38,7 @@ def install_python_libraries(ctx):
         os.path.join(RESOURCES_DIRECTORY, 'requirements.txt')
     ))
 
+
 @ctask
 def install_npm_libraries(ctx):
     ctx.run('source {0}'.format(
diff --git a/tasks/linux.py b/tasks/linux.py
index 443c688d..e15e6361 100644
--- a/tasks/linux.py
+++ b/tasks/linux.py
@@ -4,11 +4,22 @@ from invoke import ctask
 @ctask(default=True)
 def all(ctx):
     apt_get(ctx)
+    get_sbt(ctx)
 
 
-linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk', 'default-jre')
+linux_pacakges = ('zsh', 'tmux', 'emacs24-nox', 'nmap', 'scala', 'default-jdk',
+                  'default-jre', 'python-virtualenv', 'htop', 'netcat', 'wget',
+                  'zlib1g-dev', 'libxml2-dev', 'libxslt1-dev', 'python-dev',
+                  'libncurses5-dev')
 @ctask
 def apt_get(ctx):
     install_command = 'sudo apt-get -y install'
     for package in linux_pacakges:
         ctx.run('{0} {1}'.format(install_command, package), pty=False)
+
+
+@ctask
+def get_sbt(ctx):
+    ctx.run('wget http://dl.bintray.com/sbt/debian/sbt-0.13.5.deb '
+            '--output-document=sbt.deb; sudo dpkg -i sbt.deb; '
+            'sudo apt-get update; sudo apt-get install sbt; rm sbt.deb')
diff --git a/tasks/osx.py b/tasks/osx.py
index 12bc0f4d..f981ce0b 100644
--- a/tasks/osx.py
+++ b/tasks/osx.py
@@ -15,7 +15,7 @@ def all(ctx):
 
 
 ESSENTIAL = (
-    "emacs", "tmux", "python --with-brewed-openssl", "htop", "greadlink", "zsh", "make",
+    "emacs", "tmux", "python --with-brewed-openssl", "htop", "zsh", "make",
     "macvim --override-system-vim --custom-system-icons --with-features=huge "
     "--enable-rubyinterp --enable-pythoninterp --enable-perlinterp --enable-cscope"
 )