+inttrap() {
+ pid=$1
+ # just passing on -INT doesnt work.
+ kill -TERM $pid
+ sleep .05
+ if [[ ! -e /proc/$pid ]]; then
+ if [[ $old_int_trap ]]; then
+ $old_int_trap
+ else
+ trap INT
+ fi
+ fi
+}
+
+
+jrun() { # journal run. run args, log to journal, tail and grep the journal.
+ # Note, an alternative without systemd would be something like ts.
+ # Note: I tried doing cmd | pee "sudo systemd-cat" cat, but that
+ # had some problems like ctrl-c didnt work or something.
+ local pid pattern sedscript cmd_name ended
+ ret=0
+ case $1 in
+ -p)
+ pattern="$2|"
+ shift 2
+ ;;
+ esac
+ cmd_name=${1##*/}
+ sedscript="/$pattern$cmd_name/p;/^.{16}[^ ]+ $cmd_name\[[0-9]+]: ([^ ]*\/)?$cmd_name: exiting with status [0-9]+\$/q"
+ # We use >() so that $! is the pid of journalctl, otherwise its the sed pid and then
+ # if we kill that, it takes journalctl about 10 seconds to catch up, and we get
+ # an annoying message about job finishing then.
+ journalctl -qn2 -f &> >(sed -nr "$sedscript") &
+ # We kill this in prompt-command for the case that we ctrl-c the
+ # systemd-cat. i dont know any way to trap ctrl-c and still run the
+ # normal action for it. There might be a way, unsure.
+ jr_pid=$!
+ systemd-cat -t "$cmd_name" "$@" || ret=$?
+ if (( $ret )); then
+ echo "jrun: ERROR: $* returned $ret"
+ fi
+ # This justs lets the journal output its last line
+ # before the prompt comes up.
+ sleep .5
+ kill $jr_pid &>/dev/null ||:
+ unset jr_pid
+ fg &>/dev/null ||: