Merge pull request #79 from edquist/new-condor-env-format

New condor env format (SOFTWARE-3589)

Author: edquist

src/scripts/condor_submit.sh

@@ -201,19 +201,18 @@ submit_file_environment="#"
 
 if [ "x$environment" != "x" ] ; then
 # Input format is suitable for bourne shell style assignment. Convert to
-# old condor format (no double quotes in submit file).
-# FIXME: probably it's better to convert everything into the 'new' Condor
-# environment format.
+# new condor format to avoid errors  when things like LS_COLORS (which 
+# has semicolons in it) get captured
     eval "env_array=($environment)"
-    submit_file_environment=""
-    for  env_var in "${env_array[@]}"; do
-        if [ "x$submit_file_environment" == "x" ] ; then
-            submit_file_environment="environment = "
-        else
-            submit_file_environment="$submit_file_environment;"
-        fi
-        submit_file_environment="${submit_file_environment}${env_var}"
-    done
+    dq='"'
+    sq="'"
+    # map key=val -> key='val'
+    env_array=("${env_array[@]/=/=$sq}")
+    env_array=("${env_array[@]/%/$sq}")
+    # escape single-quote and double-quote characters (by doubling them)
+    env_array=("${env_array[@]//$sq/$sq$sq}")
+    env_array=("${env_array[@]//$dq/$dq$dq}")
+    submit_file_environment="environment = \"${env_array[*]}\""
 else
     if [ "x$envir" != "x" ] ; then
 # Old Condor format (no double quotes in submit file)