From a267f5ec86ad70fe8cd927d28a0db793b8635ff3 Mon Sep 17 00:00:00 2001 From: Slater-Victoroff Date: Fri, 31 May 2013 17:28:47 -0400 Subject: [PATCH] Pull request comments addressed, if else condition cleaned up --- scripts/create-dev-env.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/create-dev-env.sh b/scripts/create-dev-env.sh index 986954f9ea..9289aa42c6 100755 --- a/scripts/create-dev-env.sh +++ b/scripts/create-dev-env.sh @@ -392,8 +392,12 @@ if [[ `type -t mkvirtualenv` != "function" ]]; then 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 + else + error "Could not find virtualenvwrapper" + exit 1 ;; esac fi @@ -420,7 +424,7 @@ fi NUMPY_VER="1.6.2" SCIPY_VER="0.10.1" -if [[ -n $compile ]]; then +if [[ ! -n $compile ]]; then 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 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 output "Distribute successfully installed" else 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 case `uname -s` in