Index: tasks.scm ================================================================== --- tasks.scm +++ tasks.scm @@ -646,13 +646,13 @@ (process-signal (string->number pid) signal/int) (thread-sleep! 5) (process-signal (string->number pid) signal/kill))) ;; (call-with-environment-variables (let ((old-targethost (getenv "TARGETHOST"))) - (set-environment-variable "TARGETHOST" hostname) + (setenv "TARGETHOST" hostname) (system (conc "nbfake " kill " " pid)) - (if old-targethost (set-environment-variable "TARGETHOST" old-targethost))))) + (if old-targethost (setenv "TARGETHOST" old-targethost))))) (debug:print 0 "ERROR: no record or improper record for " target "/" run-name " in tasks_queue in monitor.db")))) records))) ;;====================================================================== Index: utils/nbfake ================================================================== --- utils/nbfake +++ utils/nbfake @@ -1,20 +1,21 @@ #!/bin/bash # Can't always trust $PWD CURRWD=`pwd` + if [[ $TARGETHOST_LOGF == "" ]]; then TARGETHOST_LOGF=NBFAKE-`date +%GWW%V.%u_%T` fi echo "#======================================================================" -echo "# NBFAKE Running command:" +echo "# NBFAKE Logging command to $TARGETHOST_LOGF" echo "# \"$*\"" echo "#======================================================================" if [[ $TARGETHOST == "" ]]; then unset TARGETHOST TARGETHOST_LOGF_TEMP=$TARGETHOST_LOGF unset TARGETHOST_LOGF - sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* > $TARGETHOST_LOGF_TEMP 2>&1 &" + sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $TARGETHOST_LOGF_TEMP 2>&1 &" else - ssh -n -f $TARGETHOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* > $TARGETHOST_LOGF 2>&1 &\"" + ssh -n -f $TARGETHOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $TARGETHOST_LOGF 2>&1 &\"" fi