From d32782e1cd0c075293f2a72146efab779653a884 Mon Sep 17 00:00:00 2001
From: Robert Izzard <r.izzard@surrey.ac.uk>
Date: Fri, 4 Feb 2022 20:47:59 +0000
Subject: [PATCH] update quoting on condor
---
binarycpython/utils/population_extensions/condor.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/binarycpython/utils/population_extensions/condor.py b/binarycpython/utils/population_extensions/condor.py
index c57a992b1..315310219 100644
--- a/binarycpython/utils/population_extensions/condor.py
+++ b/binarycpython/utils/population_extensions/condor.py
@@ -344,8 +344,8 @@ class condor:
echo "Condor Job Args: $@"
# first two arguments are ClusterID and Process
-export ClusterID=$1
-export Process=$2
+export ClusterID="$1"
+export Process="$2"
shift 2
echo "Job ClusterID $ClusterID Process $Process"
@@ -356,13 +356,13 @@ export BINARY_C_PYTHON_ORIGINAL_WD=`{pwd}`
export BINARY_C_PYTHON_ORIGINAL_SUBMISSION_TIME=`{date}`
# set status to \"running\"
-echo \"running\" > {condor_dir}/status/$ClusterID.$ProcessID
+echo \"running\" > "{condor_dir}/status/$ClusterID.$ProcessID"
# make list of files which is checked for joining
-# echo {condor_dir}/results/$ClusterID.$Process.gz >> {condor_dir}/results/$ClusterID.all
+# echo "{condor_dir}/results/$ClusterID.$Process.gz" >> "{condor_dir}/results/$ClusterID.all"
# run grid of stars and, if this returns 0, set status to finished
-{grid_command} condor=2 evolution_type=grid condor_ClusterID=$ClusterID condor_Process=$Process save_population_object={condor_dir}/results/$ClusterID.$Process.gz && echo -n \"finished\" > {condor_dir}/status/$ClusterID.$ProcessID && echo """.format(
+{grid_command} "condor=2" "evolution_type=grid" "condor_ClusterID=$ClusterID" "condor_Process=$Process" "save_population_object={condor_dir}/results/$ClusterID.$Process.gz" && echo -n \"finished\" > "{condor_dir}/status/$ClusterID.$ProcessID" && echo """.format(
bash=self.grid_options["condor_bash"],
date=self.grid_options["condor_date"],
pwd=self.grid_options["condor_pwd"],
@@ -375,7 +375,7 @@ echo \"running\" > {condor_dir}/status/$ClusterID.$ProcessID
joinfile = "{condor_dir}/results/{ClusterID}.all".format(
condor_dir=self.grid_options["condor_dir"], ClusterID=ClusterID
)
- condor_job_script += """&& echo \"Checking if we can join...\" && echo && {grid_command} condor=3 evolution_type=join joinlist={joinfile} condor_ClusterID=$ClusterID condor_Process=$Process
+ condor_job_script += """&& echo \"Checking if we can join...\" && echo && {grid_command} "condor=3" "evolution_type=join" "joinlist={joinfile}" "condor_ClusterID=$ClusterID" "condor_Process=$Process"
""".format(
bash=self.grid_options["condor_bash"],
grid_command=grid_command,
--
GitLab