Commit 88b823e3 authored by Brian Paul Bockelman's avatar Brian Paul Bockelman
Browse files

Try removing usage of wrap/unwrap scripts that are causing issues.

parent b60a6afb
......@@ -188,31 +188,6 @@ fi
add2buffer "stickydir: $stickydir"
tmpdir=`dirname $stickydir`
# find glexec_wrapenv.pl and define GLEXEC_ENV
if [ -f "$glexecdir/glexec_wrapenv.pl" ]; then
glexec_wrapenv=$glexecdir/glexec_wrapenv.pl
else
glexec_wrapenv=$currdir/glexec_wrapenv.pl
fi
add2buffer "Using glexec_wrapenv.pl at $glexec_wrapenv"
export GLEXEC_ENV=`$glexec_wrapenv`
err=$?
if [ $err -ne 0 ]; then
add2buffer "Warning: error $err executing $glexec_wrapenv"
exitcode=$NAG_WARNING
fi
# find glexec_unwrapenv.pl
if [ -f $glexecdir/glexec_unwrapenv.pl ]; then
glexec_unwrapenv=$glexecdir/glexec_unwrapenv.pl
else
cp $currdir/glexec_unwrapenv.pl $tmpdir
$glexec /bin/cp $tmpdir/glexec_unwrapenv.pl $stickydir
rm $tmpdir/glexec_unwrapenv.pl
glexec_unwrapenv=$stickydir/glexec_unwrapenv.pl
fi
add2buffer "using glexec_unwrapenv.pl at $glexec_unwrapenv"
# copy the payload executable to the payload execution directory
cp $currdir/payload.sh $tmpdir
chmod 755 $tmpdir/payload.sh
......@@ -233,7 +208,7 @@ $glexec /bin/cp $tmpdir/wrapper.sh $stickydir
rm $tmpdir/wrapper.sh
# execute the payload (payload identity) and move the output to the current directory
$glexec $glexec_unwrapenv -- $stickydir/wrapper.sh
$glexec $stickydir/wrapper.sh
err=$?
if [ $err -eq 0 ]; then
cp $stickydir/payload.out $currdir
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment