Browse Source

Merge pull request #1766 from TechEmpower/hhvm-setup-service-fix

hhvm setup service fix
ssmith-techempower 9 years ago
parent
commit
99e3805de6
3 changed files with 8 additions and 6 deletions
  1. 0 4
      requirements.txt
  2. 1 1
      toolset/setup/linux/languages/hhvm.sh
  3. 7 1
      toolset/setup/linux/prerequisites.sh

+ 0 - 4
requirements.txt

@@ -1,4 +0,0 @@
-colorama==0.3.1
-# Version 2.3 has a nice Counter() and other features
-# but it requires —-allow-external and -—allow-unverified
-progressbar==2.2

+ 1 - 1
toolset/setup/linux/languages/hhvm.sh

@@ -11,7 +11,7 @@ echo deb http://dl.hhvm.com/ubuntu `lsb_release -sc` main | sudo tee /etc/apt/so
 sudo apt-get update
 sudo apt-get install -y hhvm
 
-sudo service stop hhvm
+sudo service hhvm stop
 
 echo "" > $IROOT/hhvm.installed
 

+ 7 - 1
toolset/setup/linux/prerequisites.sh

@@ -53,7 +53,13 @@ sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
   llvm-dev                          `# Required for correct Ruby installation` \
   libboost-dev                      `# Silicon relies on boost::lexical_cast.` \
   postgresql-server-dev-9.3         `# Needed by cpoll.` \
-  xdg-utils                         `# Needed by dlang.`
+  xdg-utils                         `# Needed by dlang.` \
+  python-pip
+
+sudo pip install colorama==0.3.1
+# Version 2.3 has a nice Counter() and other features
+# but it requires —-allow-external and -—allow-unverified
+sudo pip install progressbar==2.2
 
 # Install gcc-4.8 and gcc-4.9
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y