Commit 9bde5123 authored by Maiken's avatar Maiken
Browse files

Merge branch 'boincdefault' into 'next'

better batchid parsing; echo to stderr

See merge request nordugrid/arc!587
parents 6fa11334 882d88d5
...@@ -399,7 +399,7 @@ fi ...@@ -399,7 +399,7 @@ fi
batchid= batchid=
if [ ! -z "$joboption_arg_2" ]; then if [ ! -z "$joboption_arg_2" ]; then
taskid=$(echo $joboption_arg_2|grep -m1 -o taskID=........|cut -d = -f 2 ) taskid=$(echo $joboption_arg_2|grep -E -m1 -o "taskID=[[:digit:]]+"|cut -d = -f 2 )
if [ ! -z "$taskid" ]; then if [ ! -z "$taskid" ]; then
batchid="--batch $taskid" batchid="--batch $taskid"
fi fi
...@@ -436,10 +436,11 @@ echo 'ret=$?' >>$LRMS_JOB_BOINC ...@@ -436,10 +436,11 @@ echo 'ret=$?' >>$LRMS_JOB_BOINC
echo 'exit $ret' >>$LRMS_JOB_BOINC echo 'exit $ret' >>$LRMS_JOB_BOINC
if [ $DEBUG -eq 2 ];then if [ $DEBUG -eq 2 ];then
cat $LRMS_JOB_BOINC cat $LRMS_JOB_BOINC 1>&2
else else
sh $LRMS_JOB_BOINC 1>&2 >/tmp/log.boinc sh $LRMS_JOB_BOINC 1>&2
fi fi
rc=$? rc=$?
if [ $rc -eq 0 ];then if [ $rc -eq 0 ];then
......
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