Merge commit 'f587'HEADmaster

4 files changed, 102 insertions, 16 deletions

diff --git a/dot/local/bin/latest b/dot/local/bin/latest
index ef95cfe..12a0a9f 100755
--- a/dot/local/bin/latest
+++ b/dot/local/bin/latest
@@ -3,23 +3,45 @@ usage()
 {
     cat <<EOF
 Usage: $0 [directory] [...]
+Usage: $0 --help
 
-Print the filename of the newest file.
+Searches the current directory if none is specified.
+
+Print one filename: the single newest ordinary file from all (not each)
+of the specified directories.
+
+If there are no ordinary files, there is no output.
+
+Symbolic links are not listed.
 
-Searches the directories specified on the command line,
-or else the current directory if none specified.
 EOF
 }
 
 case $# in
     0) set -- . ;;
-    1) if [ "$1" = --usage ]; then usage; exit 0; fi ;;
+    1) if [ "$1" = --usage ]
+       then
+           usage
+           exit 0
+       fi
+       ;;
 esac
 
-extract()
+drop_first_word()
+{
+    sed -ne 's/^[^ ]* //p'
+}
+
+extract_newest()
+{
+    sort -z -n -k1,1 -r | head -z -n 1 | xargs -r -0 printf '%s\n'
+}
+
+find_simple_files()
 {
-    sort -z -n -k1,1 -r | head -z -n 1 | xargs -0 printf '%s\n' | perl -pe 's/.*? //'
+    pattern="%C@ %h/%f\0"
+    find "$@" -maxdepth 1 -name '.*' -o \( -type f -printf "$pattern" \)
 }
 
-find "$@" -maxdepth 1 -name '.*' -o \( -type f -printf "%C@ %h/%f\0" \) | extract
+find_simple_files "$@" | extract_newest | drop_first_word
 
diff --git a/dot/local/bin/lpdf b/dot/local/bin/lpdf
new file mode 100755
index 0000000..41f52c4
--- /dev/null
+++ b/dot/local/bin/lpdf
@@ -0,0 +1,44 @@
+#!/bin/bash
+# lpdf -- print with lp to a PDF file; output the filename to stdout
+
+move_pdf()
+{
+    local o f="$1"
+    o=$f
+    o=${o##*/}
+    o=${o%%__*}
+    o=${o%.txt}.pdf
+    mv -i -T -- "$f" "$o"
+}
+
+run_lp()
+{
+    set -x
+    lp "$@" -d PDF
+}
+
+extract_lp_pdf_filename()
+{
+    read _ _ _ pdf _
+    case "$pdf" in
+        PDF-*) glob=$(printf "~/PDF/*-job_%s.pdf\n" "${pdf#PDF-}") ;;
+        *) exit 1 ;;
+    esac
+
+    sleep=1
+    while true
+    do
+        if f=$(shopt -s failglob; 2>/dev/null eval "echo $glob")
+        then
+            printf "%s\n" "$f"
+            break
+        else
+            sleep $sleep
+            sleep=$((sleep + 1))
+        fi
+    done
+}
+
+set -e
+read pdf < <(run_lp "$@" | extract_lp_pdf_filename)
+move_pdf "$pdf"
diff --git a/dot/local/bin/scan b/dot/local/bin/scan
index 2ba071b..2a7ac71 100644
--- a/dot/local/bin/scan
+++ b/dot/local/bin/scan
@@ -1,16 +1,17 @@
 #!/bin/sh
 NOW=$( TZ=UTC date -Ins | tr T . | tr -d : | sed -E 's/(..),(...).*/\1.\2/' )
 
-if [ $# = 0 ]
+if [ "$ACTUAL_BATCH" -a $# = 0 ]
 then
-        ACTUAL_BATCH=
-fi
-
-if $ACTUAL_BATCH
-then
-        format=scan_${NOW}_%.3d.png
+        FORMAT=scan_${NOW}_%.3d.png
 else
-        format=scan_${NOW}.png
+        FORMAT=scan_${NOW}.png
 fi
 
-scanimage --progress --format=png --batch="$format"
+RESOLUTION=600
+
+scanimage --progress \
+        --mode=Color \
+        --resolution="$RESOLUTION" \
+        --format=png \
+        --batch="$FORMAT"
diff --git a/dot/local/bin/ssh-shellwrap b/dot/local/bin/ssh-shellwrap
new file mode 100755
index 0000000..e0d537e
--- /dev/null
+++ b/dot/local/bin/ssh-shellwrap
@@ -0,0 +1,19 @@
+#!/bin/bash
+# ssh wrapper; requires "--" before host argument
+options=()
+while [ $# -gt 0 ]
+do
+    case $1 in
+        -- ) break ;;
+    esac
+    options+=("$1")
+    shift
+done
+set -e
+[ "$1" = '--' ]
+shift
+[ $# -gt 0 ]
+host=$1
+shift
+ssh "${options[@]}" -- "$host" ${*@Q}
+