Merge pull request #448 from FranklinChen/fix-linux-install-scripts

Final (hopefully) fix of Linux installation scripts.

build.sh

@@ -68,13 +68,8 @@ done
 # Stick a "./" before everything.
 INSTALL_DIRS=`echo $INSTALLS | tr ' ' '\n' | sed 's#^#./#' | tr ' ' '\n'`
 
-if [ `uname` = Darwin ]; then
-  echo CMD: cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
+echo CMD: cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
   cabal install --constraint "arithmoi -llvm" -j $INSTALL_DIRS --force-reinstalls --max-backjumps=-1 --reorder-goals
-else
-  echo CMD: cabal install -j $INSTALL_DIRS --force-reinstalls --constraint "arithmoi==0.4.*" --max-backjumps=-1 --reorder-goals
-  cabal install -j $INSTALL_DIRS --force-reinstalls --constraint "arithmoi==0.4.*" --max-backjumps=-1 --reorder-goals
-fi
 
 if hash ihaskell 2>/dev/null; then
     ihaskell install 2>/dev/null || echo "\"ihaskell install\" - failed, pls check your ipython --version required 3.0.0 but is $(ipython --version)"

linux-install.sh

@@ -23,6 +23,9 @@ fi
 #sudo apt-get install python-pip
 sudo apt-get install -y python-dev
 
+# To get easy_install
+sudo apt-get install -y python-setuptools
+
 sudo easy_install -U pip
 
 # -H to use .cache in /root
@@ -41,4 +44,6 @@ sudo apt-get install -y libzmq3-dev
 sudo apt-get install -y libcairo2-dev
 sudo apt-get install -y libpango1.0-dev
 
+sudo apt-get install -y libmagic-dev
+
 ./build.sh all