lpdf

1 files changed, 31 insertions, 5 deletions

diff --git a/dot/local/bin/lpdf b/dot/local/bin/lpdf
index 911be80..41f52c4 100755
--- a/dot/local/bin/lpdf
+++ b/dot/local/bin/lpdf
@@ -1,18 +1,44 @@
 #!/bin/bash
-
 # lpdf -- print with lp to a PDF file; output the filename to stdout
 
-lp "$@" -d PDF |
+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=0.1
-    while ! (eval "shopt -s failglob; echo $glob") 2>/dev/null
+
+    sleep=1
+    while true
     do
-        sleep $sleep
+        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"