From 61a11341f9eb5f18ac33bd88e6acefc37a6f46af Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Fri, 8 Jul 2016 10:52:08 -0400
Subject: [PATCH] When CONDA_ALREADY_INSTALLED is undefined there's an error
 due to the number of arguments in the boolean expression (we actually *do*
 always want a 1 or 0 there, never empty)

---
 scripts/common_startup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh
index 923162b287b..b7602379e6f 100755
--- a/scripts/common_startup.sh
+++ b/scripts/common_startup.sh
@@ -10,6 +10,8 @@ done
 if python -V 2>&1 | grep -q -e 'Anaconda' -e 'Continuum Analytics' ; then
     SET_VENV=0
     CONDA_ALREADY_INSTALLED=1
+else
+    CONDA_ALREADY_INSTALLED=0
 fi
 
 DEV_WHEELS=0
@@ -128,7 +130,7 @@ if [ $SET_VENV -eq 1 ]; then
         echo "ERROR: A virtualenv cannot be found. Please create a virtualenv in $GALAXY_VIRTUAL_ENV, or activate one."
         exit 1
     fi
-elif [ $SET_VENV -eq -0 -a $CONDA_ALREADY_INSTALLED -eq 1 ]; then
+elif [ $SET_VENV -eq 0 -a $CONDA_ALREADY_INSTALLED -eq 1 ]; then
     echo -e "\e[33mWarning: You have Conda installed. Skipping virtualenv activation. This could cause missing dependencies.\e[0m"
 fi