Merge pull request opensciencegrid#22 from brianhlin/sw2199_sge_colorado

Correctly setup the environment for SGE job submission (SOFTWARE-2199)
brianhlin · Feb 10, 2016 · 0f300fc · 0f300fc
2 parents 5bf1104 + 71cbdb1
commit 0f300fc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/scripts/sge_cancel.sh b/src/scripts/sge_cancel.sh
@@ -20,7 +20,7 @@
 #
 
 
-[ -f ${GLITE_LOCATION:-/opt/glite}/etc/blah.config ] && . ${GLITE_LOCATION:-/opt/glite}/etc/blah.config
+. `dirname $0`/blah_load_config.sh
 
 if [ -z "$sge_rootpath" ]; then sge_rootpath="/usr/local/sge/pro"; fi
 if [ -r "$sge_rootpath/${sge_cellname:-default}/common/settings.sh" ]

diff --git a/src/scripts/sge_hold.sh b/src/scripts/sge_hold.sh
@@ -20,7 +20,7 @@
 #
 
 
-[ -f ${GLITE_LOCATION:-/opt/glite}/etc/blah.config ] && . ${GLITE_LOCATION:-/opt/glite}/etc/blah.config
+. `dirname $0`/blah_load_config.sh
 
 if [ -z "$sge_rootpath" ]; then sge_rootpath="/usr/local/sge/pro"; fi
 if [ -r "$sge_rootpath/${sge_cellname:-default}/common/settings.sh" ]

diff --git a/src/scripts/sge_resume.sh b/src/scripts/sge_resume.sh
@@ -20,7 +20,7 @@
 #
 
 
-[ -f ${GLITE_LOCATION:-/opt/glite}/etc/blah.config ] && . ${GLITE_LOCATION:-/opt/glite}/etc/blah.config
+. `dirname $0`/blah_load_config.sh
 
 if [ -z "$sge_rootpath" ]; then sge_rootpath="/usr/local/sge/pro"; fi
 if [ -r "$sge_rootpath/${sge_cellname:-default}/common/settings.sh" ]

diff --git a/src/scripts/sge_status.sh b/src/scripts/sge_status.sh
@@ -20,10 +20,9 @@
 #
 
 
-#[ -f ${GLITE_LOCATION:-/opt/glite}/etc/blah.config ] && . ${GLITE_LOCATION:-/opt/glite}/etc/blah.config
 . `dirname $0`/blah_load_config.sh
 
-sge_helper_path=${GLITE_LOCATION:-/opt/glite}/bin
+sge_helper_path=${blah_libexec_directory}
 
 usage_string="Usage: $0 [-w] [-n]"
 
@@ -68,7 +67,7 @@ tmpid=`echo "$@"|sed 's/.*\/.*\///g'`
 jobid=${tmpid}.${sge_cellname:-default}
 
 
-blahp_status=`exec ${sge_helper_path:-/opt/glite/bin}/sge_helper --status $getwn $jobid`
+blahp_status=`exec ${sge_helper_path}/sge_helper --status $getwn $jobid`
 retcode=$?
 
 # Now see if we need to run qstat 'manually'

diff --git a/src/scripts/sge_submit.sh b/src/scripts/sge_submit.sh
@@ -64,7 +64,7 @@ cat > $bls_tmp_file << end_of_preamble
 end_of_preamble
 
 #local batch system-specific file output must be added to the submit file
-local_submit_attributes_file=${GLITE_LOCATION:-/opt/glite}/bin/sge_local_submit_attributes.sh
+local_submit_attributes_file=${blah_libexec_directory}/sge_local_submit_attributes.sh
 if [ -r $local_submit_attributes_file ] ; then
     echo \#\!/bin/sh > $bls_opt_tmp_req_file
     if [ ! -z $bls_opt_req_file ] ; then