Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.

Commit 6294ef0

Browse files
committed
cleanup $submit_file_environment calculation
always map key=val -> key='val', and don't do it in a big loop. the $sq variable is used for single quotes, to avoid quoting weirdness inside of the env_array substitution lines.
1 parent 8fe02e4 commit 6294ef0

1 file changed

Lines changed: 4 additions & 18 deletions

File tree

src/scripts/condor_submit.sh

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -204,24 +204,10 @@ if [ "x$environment" != "x" ] ; then
204204
# new condor format to avoid errors when things like LS_COLORS (which
205205
# has semicolons in it) get captured
206206
eval "env_array=($environment)"
207-
submit_file_environment=""
208-
for env_var in "${env_array[@]}"; do
209-
if [ "x$submit_file_environment" == "x" ] ; then
210-
submit_file_environment="environment = \" ${env_var}"
211-
else
212-
# check for spaces in env_var
213-
pattern=" "
214-
if [[ $env_var =~ $pattern ]]; then
215-
fixed_env_var="${env_var}'"
216-
fixed_env_var=`echo ${fixed_env_var} | sed -e "s|=|='|"`
217-
echo "12 -- ${fixed_env_var}" >> ~/foo
218-
submit_file_environment="${submit_file_environment} ${fixed_env_var} "
219-
else
220-
submit_file_environment="${submit_file_environment} ${env_var} "
221-
fi
222-
fi
223-
done
224-
submit_file_environment="${submit_file_environment}\""
207+
sq="'" # map key=val -> key='val'
208+
env_array=("${env_array[@]/=/=$sq}")
209+
env_array=("${env_array[@]/%/$sq}")
210+
submit_file_environment="environment = \"${env_array[*]}\""
225211
else
226212
if [ "x$envir" != "x" ] ; then
227213
# Old Condor format (no double quotes in submit file)

0 commit comments

Comments
 (0)