Merge pull request #4618 from emaszs/crab_light_fix

Deal with outside CL arguments passed to crab_light.sh
dmwm · May 23, 2016 · be3f0b8 · be3f0b8
2 parents 85f62fc + dfb9fc9
commit be3f0b8
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/etc/init-light.sh b/etc/init-light.sh
@@ -16,14 +16,10 @@ CRAB3_PY_ROOT=$(getVariableValue \$CRABCLIENT_ROOT \$PYTHON_LIB_SITE_PACKAGES)
 DBS3_PY_ROOT=$(getVariableValue \$DBS3_CLIENT_ROOT \$PYTHON_LIB_SITE_PACKAGES)
 DBS3_PYCURL_ROOT=$(getVariableValue \$DBS3_PYCURL_CLIENT_ROOT \$PYTHON_LIB_SITE_PACKAGES)
 
-if [ $# -gt 0 ]; then
-    if [ "x$1" == "x-csh" ]; then
-        echo "setenv PYTHONPATH $PYTHONPATH:$CRAB3_PY_ROOT:$DBS3_PY_ROOT:$DBS3_PYCURL_ROOT; \
-                        setenv PATH $PATH:$CRAB3_BIN_ROOT"
-    else
-        exit 254
-    fi
-else
+if [ $# -gt 0 ] && [ "$1" == "-csh" ]; then
+    echo "setenv PYTHONPATH $PYTHONPATH:$CRAB3_PY_ROOT:$DBS3_PY_ROOT:$DBS3_PYCURL_ROOT; \
+                   setenv PATH $PATH:$CRAB3_BIN_ROOT"
+else 
     export PYTHONPATH=$PYTHONPATH:$CRAB3_PY_ROOT:$DBS3_PY_ROOT:$DBS3_PYCURL_ROOT
     export PATH=$PATH:$CRAB3_BIN_ROOT
     if [ -n "$BASH" ]; then