Merge pull request #81 from edquist/SOFTWARE-3589.escape-fixie

escape existing quote characters first (SOFTWARE-3589)
opensciencegrid · May 15, 2019 · 5ec24db · 5ec24db
2 parents 81de825 + 4e67757
commit 5ec24db
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/scripts/condor_submit.sh b/src/scripts/condor_submit.sh
@@ -206,12 +206,12 @@ if [ "x$environment" != "x" ] ; then
     eval "env_array=($environment)"
     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}")
+    # map key=val -> key='val'
+    env_array=("${env_array[@]/=/=$sq}")
+    env_array=("${env_array[@]/%/$sq}")
     submit_file_environment="environment = \"${env_array[*]}\""
 else
     if [ "x$envir" != "x" ] ; then