summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Maia <patrickjourdanmaia@gmail.com>2014-12-17 15:34:20 +0000
committerPatrick Maia <patrickjourdanmaia@gmail.com>2014-12-17 15:34:20 +0000
commit200ad7d4a5b5f39717c81eb6a9ad3844044b037c (patch)
tree15abefa0c7995ff0adda612f52a8dbbd40a2fe48
parent93bdcc0c2a45fcf54ab979188c0de662dbed947a (diff)
parent95c398b6f4721204c01546241b127d95ebefd334 (diff)
Merge branch '197_improve_installation'
-rw-r--r--README.md5
-rwxr-xr-xinstall-pixelated.sh3
-rw-r--r--provisioning/provision.sh4
3 files changed, 6 insertions, 6 deletions
diff --git a/README.md b/README.md
index f529d8e0..9e6317c6 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,10 @@ The User Agent has 2 components:
Dependencies are: node, npm, compass (ruby), virtualenv, git
-* To install the dependencies on debian/ubuntu you need to run `sudo apt-get install nodejs npm ruby virtualenv git` and then `sudo gem install compass`
+* To install the dependencies on debian/ubuntu you need to run:
+ * `sudo apt-get update`
+ * `sudo apt-get install git nodejs-legacy npm python-dev python-virtualenv libffi-dev g++ ruby-dev`
+ * `sudo gem install compass`
* Next step is cloning the repository with `git clone https://github.com/pixelated-project/pixelated-user-agent.git`
diff --git a/install-pixelated.sh b/install-pixelated.sh
index ed9e6f07..3ab8c422 100755
--- a/install-pixelated.sh
+++ b/install-pixelated.sh
@@ -32,10 +32,9 @@ function check_installed() {
fi
}
-for dependency in node npm ruby virtualenv git gpg; do
+for dependency in node npm ruby virtualenv git gpg compass; do
check_installed $dependency
done
-gem install compass
# install web-ui dependencies
cd web-ui
diff --git a/provisioning/provision.sh b/provisioning/provision.sh
index c4093232..48c0237b 100644
--- a/provisioning/provision.sh
+++ b/provisioning/provision.sh
@@ -1,9 +1,7 @@
export LC_ALL=en_US.UTF-8
sudo apt-get update
-sudo apt-get install -y git nodejs-legacy npm python-setuptools python-dev libffi-dev g++ rng-tools ruby-dev
-sudo easy_install pip
-sudo pip install virtualenv
+sudo apt-get install -y git nodejs-legacy npm python-dev python-virtualenv libffi-dev g++ rng-tools ruby-dev
sudo gem install compass
sudo echo "HRNGDEVICE=/dev/urandom" >> /etc/default/rng-tools