diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-15 09:15:48 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2018-01-15 09:17:05 +1300 |
commit | edf0a0305169a57a6d9ec49df8628e8f213b9a86 (patch) | |
tree | f543172c845a42305ae4fc75744d9a7c09688f7d | |
parent | Reimplement bl(1df) in Awk (diff) | |
download | dotfiles-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.
-rw-r--r-- | bin/clog.sh | 23 | ||||
-rw-r--r-- | man/man1/clog.1df | 20 |
2 files changed, 27 insertions, 16 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" diff --git a/man/man1/clog.1df b/man/man1/clog.1df index 43193076..f9300347 100644 --- a/man/man1/clog.1df +++ b/man/man1/clog.1df @@ -3,18 +3,28 @@ .B clog \- record timestamped logs in a file .SH SYNOPSIS +$ .B clog .br -getting real tired of all this overengineering +Getting real tired of all this overengineering. .br ^D +.br +$ +.B clog +file1 file2 +.br +$ +command | +.B clog .SH DESCRIPTION .B clog -receives a message on stdin, timestamps it with a leading date(1), and writes -it to the file with path in environment variable CLOG, defaulting to ~/.clog, -terminating each entry with two hyphens. +receives a message on stdin or from the file arguments, timestamps it with a +leading date(1), and writes it to the file with path in environment variable +CLOG, defaulting to ~/.clog, terminating each entry with two hyphens. .P -If rlwrap(1) is found, it will be used for the line editing. If not, just the +If there are no files to read and standard input is coming from a terminal, and +rlwrap(1) is found, it will be used for the line editing. If not, just the terminal's cooked mode will be used. .SH AUTHOR Tom Ryder <tom@sanctum.geek.nz> |