Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -1,21 +1,74 @@
 #!/bin/bash
+###############################################################################
+#
+# nbfake - capture command output in a logfile
+#
+# nbfake behavior can be changed by setting the following env vars:
+#   NBFAKE_HOST       SSH to $NBFAKE_HOST and run command
+#   NBFAKE_LOG        Logfile for nbfake output
+#
+###############################################################################
+
+if [[ -z "$@" ]]; then
+  cat <<__EOF
+
+nbfake usage:
+
+nbfake <command to run>
+
+nbfake behavior can be changed by setting the following env vars:
+   NBFAKE_HOST       SSH to \$NBFAKE_HOST and run command
+   NBFAKE_LOG        Logfile for nbfake output
+
+__EOF
+  exit
+fi
+
+#==============================================================================
+# Setup
+#==============================================================================
 
 # Can't always trust $PWD
-CURRWD=`pwd`
+CURRWD=$(pwd)
+
+# Make sure nbfake host and logfile are set. Fall back to old-style variable names
+
+if [[ -z "$NBFAKE_HOST" && -n "$TARGETHOST" ]]; then 
+  MY_NBFAKE_HOST=$TARGETHOST     
+else
+  MY_NBFAKE_HOST=$NBFAKE_HOST
+  unset NBFAKE_HOST
+fi
+
+
+if [[ -z "$NBFAKE_LOG" && -n "$TARGETHOST_LOGF" ]]; then 
+  MY_NBFAKE_LOG=$TARGETHOST_LOGF
+else
+  MY_NBFAKE_LOG=$NBFAKE_LOG
+  unset NBFAKE_LOG
+fi
+
+# Set default nbfake log
 
-if [[ $TARGETHOST_LOGF == "" ]]; then
-    TARGETHOST_LOGF=NBFAKE-`date +%GWW%V.%u_%T`
+if [[ -z "$MY_NBFAKE_LOG" ]]; then
+  MY_NBFAKE_LOG=NBFAKE-$(date +%GWW%V.%u_%T)
 fi
-echo "#======================================================================"
-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 &"
-else
-  ssh -n -f $TARGETHOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $TARGETHOST_LOGF 2>&1 &\""
+
+#==============================================================================
+# Run and log
+#==============================================================================
+
+cat <<__EOF >&2
+#======================================================================
+# NBFAKE logging command to: $MY_NBFAKE_LOG
+#     $*
+#======================================================================
+__EOF
+
+if [[ -z "$MY_NBFAKE_HOST" ]]; then
+  # Run locally
+  sh -c "cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &"
+else
+  # run remotely
+  ssh -n -f $MY_NBFAKE_HOST "sh -c \"cd $CURRWD;export DISPLAY=$DISPLAY; export PATH=$PATH; nohup $* >> $MY_NBFAKE_LOG 2>&1 &\""
 fi