fix(skip-exist): messages have template sub cmd; use __SKIPFILE

Author: WillForan

skip-exist

@@ -11,38 +11,39 @@ REDO=${REDO:-0} # default: skip if exists. REDO !=0 means overwrite
 
 usage(){
    [ $# -gt 0 ] && echo "$*"
+   local c=$(basename $0)
   cat <<HERE
 USAGE:
-  $0 'path/file/to/check' cmd
+  $c 'path/file/to/check' cmd
 
-  $0 sub-1/mri/aseg.nii.gz recon-all -s sub-1
-  $0 sub-1/mri/aseg.nii.gz dryrun recon-all -s sub-1
-  REDO=1 $0 sub-1/mri/aseg.nii.gz recon-all -s sub-1
+  $c sub-1/mri/aseg.nii.gz recon-all -s sub-1
+  $c sub-1/mri/aseg.nii.gz dryrun recon-all -s sub-1
+  REDO=1 $c sub-1/mri/aseg.nii.gz recon-all -s sub-1
 
-  $0 /tmp/date.txt sh -c "date > _SKIPFILE"
+  $c /tmp/date.txt sh -c "date > __SKIPFILE"
 
 SYNOPSIS:
   'test -s' wrapper with REDO and verbose messaging support
 
-   _SKIPFILE in cmd will be replaced by first argument
+   __SKIPFILE in cmd will be replaced by first argument
 
 ENVIRONMENT:
    REDO=1  - overwrite (redo) even if output file exists
 
 NOTES:
   Watch out for redirection. DONT DO THIS
-     $0 /tmp/date.txt date > /tmp/date.txt # BAD BAD BAD
+     $c /tmp/date.txt date > /tmp/date.txt # BAD BAD BAD
 
   Instead, use an exported function
 
      writedate() { date > \$1; }; export -f writedate
-     $0 /tmp/date.txt writedate /tmp/date.txt
+     $c /tmp/date.txt writedate /tmp/date.txt
 
   or a dedicated shell
 
-     $0 /tmp/date.txt sh -c 'date > /tmp/date.txt'
+     $c /tmp/date.txt sh -c 'date > /tmp/date.txt'
 
-  But maybe '$0' is overkill for your usage. Consider:
+  But maybe '$c' is overkill for your usage. Consider:
 
      test -s /tmp/date.txt || date > \$_
 
@@ -60,10 +61,10 @@ outfile="${1:?need two args. first is outfile}"; shift
    usage "ERROR: no command to run if '$outfile' doesn't exist" >&2 &&
    exit 1
 
-cmd=("${@//_SKIPFILE/"$outfile"}")
+cmd=("${@//__SKIPFILE/"$outfile"}")
 if [ -s "$outfile" ]; then
    [ "$REDO" == 0 ] &&
-      echo "# SKIP: Already have '$outfile', not running '$*'; set REDO=1 to overwrite." >&2 &&
+      echo "# SKIP: Already have '$outfile', not running '${cmd[*]}'; set REDO=1 to overwrite." >&2 &&
       exit 0
    echo " # Already have '$outfile' but overwritting: REDO=$REDO." >&2
 fi
@@ -76,6 +77,6 @@ cmd_status=$?
 
 # if there is an error (cmd_status > 0), should we still warn?
 test $cmd_status -eq 0 -a -s "$outfile" ||
-   echo "# WARNING: '$outfile' DNE or is empty after '$*'" >&2
+   echo "# WARNING: '$outfile' DNE or is empty after '${cmd[*]}'" >&2
 
 exit $cmd_status

t/skip-exist.bats

@@ -65,7 +65,7 @@ test_skipexist_space() { # @test
 
 test_skipexist_SKIPFILE() { # @test
    o=$BATS_TEST_TMPDIR/"a b"
-   run skip-exist "$o" writedate _SKIPFILE
+   run skip-exist "$o" writedate __SKIPFILE
    test -s "$o"
    dt=$(cat "$o")
    run skip-exist "$o" writedate "$o"