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

Commit 8fe02e4

Browse files
committed
Use new condor env format
1 parent c065485 commit 8fe02e4

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

src/scripts/condor_submit.sh

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -201,19 +201,27 @@ submit_file_environment="#"
201201

202202
if [ "x$environment" != "x" ] ; then
203203
# Input format is suitable for bourne shell style assignment. Convert to
204-
# old condor format (no double quotes in submit file).
205-
# FIXME: probably it's better to convert everything into the 'new' Condor
206-
# environment format.
204+
# new condor format to avoid errors when things like LS_COLORS (which
205+
# has semicolons in it) get captured
207206
eval "env_array=($environment)"
208207
submit_file_environment=""
209208
for env_var in "${env_array[@]}"; do
210209
if [ "x$submit_file_environment" == "x" ] ; then
211-
submit_file_environment="environment = "
210+
submit_file_environment="environment = \" ${env_var}"
212211
else
213-
submit_file_environment="$submit_file_environment;"
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
214222
fi
215-
submit_file_environment="${submit_file_environment}${env_var}"
216223
done
224+
submit_file_environment="${submit_file_environment}\""
217225
else
218226
if [ "x$envir" != "x" ] ; then
219227
# Old Condor format (no double quotes in submit file)

0 commit comments

Comments
 (0)