aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-15 09:15:48 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-15 09:17:05 +1300
commitedf0a0305169a57a6d9ec49df8628e8f213b9a86 (patch)
treef543172c845a42305ae4fc75744d9a7c09688f7d /bin
parentReimplement bl(1df) in Awk (diff)
downloaddotfiles-edf0a0305169a57a6d9ec49df8628e8f213b9a86.tar.gz
dotfiles-edf0a0305169a57a6d9ec49df8628e8f213b9a86.zip
Refactor clog(1df), allow args and non-term stdin
This makes a bit clearer how awkward the rlwrap(1) code is, too. It may not be worth keeping it.
Diffstat (limited to 'bin')
-rw-r--r--bin/clog.sh23
1 files changed, 12 insertions, 11 deletions
diff --git a/bin/clog.sh b/bin/clog.sh
index 1b612d68..81bfd744 100644
--- a/bin/clog.sh
+++ b/bin/clog.sh
@@ -1,17 +1,18 @@
# Record a timestamped message to a logfile, defaulting to ~/.clog
self=clog
-# Ignore arguments
-set --
+# Build the cat(1) command we'll run, wrapping it in rlwrap(1) if available and
+# applicable.
+if [ "$#" -eq 0 ] && [ -t 0 ] && command -v rlwrap >/dev/null 2>&1 ; then
+ set -- rlwrap --history-filename=/dev/null cat -- "${@:--}"
+else
+ set -- cat -- "${@:--}"
+fi
-# If we have rlwrap, quietly use it
-command -v rlwrap >/dev/null 2>&1 &&
- set -- rlwrap --history-filename=/dev/null -C "$self" "$@"
-
-# Write the date, the standard input (rlwrapped if applicable), and two dashes
-# to $CLOG, defaulting to ~/.clog.
+# Write the date, the input, and two dashes to $CLOG, defaulting to ~/.clog.
+clog=${CLOG:-"$HOME"/.clog}
{
date
- "$@" cat -
- printf '%s\n' --
-} >>"${CLOG:-"$HOME"/.clog}"
+ "$@"
+ printf -- '--\n'
+} >> "$clog"