Commit a267f5ec by Slater-Victoroff

Pull request comments addressed, if else condition cleaned up

parent c5b95e39
...@@ -392,8 +392,12 @@ if [[ `type -t mkvirtualenv` != "function" ]]; then ...@@ -392,8 +392,12 @@ if [[ `type -t mkvirtualenv` != "function" ]]; then
source `which virtualenvwrapper.sh` source `which virtualenvwrapper.sh`
;; ;;
*) squeeze|wheezy|jessie|maya|lisa|olivia|nadia|natty|oneiric|precise|quantal|raring)
if [[ -f "/etc/bash_completion.d/virtualenvwrapper"]]; then
source /etc/bash_completion.d/virtualenvwrapper source /etc/bash_completion.d/virtualenvwrapper
else
error "Could not find virtualenvwrapper"
exit 1
;; ;;
esac esac
fi fi
...@@ -420,7 +424,7 @@ fi ...@@ -420,7 +424,7 @@ fi
NUMPY_VER="1.6.2" NUMPY_VER="1.6.2"
SCIPY_VER="0.10.1" SCIPY_VER="0.10.1"
if [[ -n $compile ]]; then if [[ ! -n $compile ]]; then
output "Downloading numpy and scipy" output "Downloading numpy and scipy"
curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz curl -sL -o numpy.tar.gz http://downloads.sourceforge.net/project/numpy/NumPy/${NUMPY_VER}/numpy-${NUMPY_VER}.tar.gz
curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz curl -sL -o scipy.tar.gz http://downloads.sourceforge.net/project/scipy/scipy/${SCIPY_VER}/scipy-${SCIPY_VER}.tar.gz
...@@ -455,6 +459,7 @@ if [[ "$DISTRIBUTE_VERSION" == "distribute==0.6.28" ]]; then ...@@ -455,6 +459,7 @@ if [[ "$DISTRIBUTE_VERSION" == "distribute==0.6.28" ]]; then
output "Distribute successfully installed" output "Distribute successfully installed"
else else
error "Distribute failed to build correctly. This script requires a working version of Distribute 0.6.28 in your virtualenv's python installation" error "Distribute failed to build correctly. This script requires a working version of Distribute 0.6.28 in your virtualenv's python installation"
exit 1
fi fi
case `uname -s` in case `uname -s` in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment