From: madduck Date: Thu, 19 Oct 2006 11:05:59 +0000 (+0000) Subject: various improvements X-Git-Tag: 0.2 X-Git-Url: https://git.madduck.net/code/molly-guard.git/commitdiff_plain/af2915093382dbef955f4ef91a73d474893f9f6e various improvements --- diff --git a/shutdown b/shutdown index 65fd374..cb567c2 100755 --- a/shutdown +++ b/shutdown @@ -19,6 +19,7 @@ case "$CMD" in if [ ! -f $EXEC ]; then echo "E: $ME: not a regular file: $EXEC" >&2 exit 4 + fi if [ ! -x $EXEC ]; then echo "E: $ME: not an executable: $EXEC" >&2 exit 3 @@ -33,7 +34,14 @@ ARGS="$@" do_real_cmd() { - exec $EXEC "$ARGS" + case "$ARGS" in + (*--molly-guard-do-nothing*) + ARGS0="${ARGS%%--molly-guard-do-nothing*}" + ARGS1="${ARGS##*--molly-guard-do-nothing}" + echo "$ME: would run: $EXEC $ARGS0 $ARGS1" + exit 0;; + *) exec $EXEC "$ARGS";; + esac } # require $SSH_CONNECTION to be set, indicates an SSH session @@ -42,16 +50,27 @@ do_real_cmd() test -t 0 || do_real_cmd # pass through help commands case "$CMD $ARGS" in - 'shutdown*-c'|'*-h') do_real_cmd;; + (shutdown\ *-c*) do_real_cmd;; + (*-h*) do_real_cmd;; *) :;; esac -echo -n "$ME: SSH session detected, type in hostname of the machine to $CMD: " -read HOSTNAME_USER - HOSTNAME="$(hostname)" -if [ "$HOSTNAME_USER" != "$HOSTNAME" ]; then +sigh() +{ echo "Good thing I asked; I won't $CMD $HOSTNAME ..." exit 2 -fi +} + +trap 'echo;sigh' 1 2 3 9 10 12 15 + +echo "$ME: SSH session detected!" +echo -n "Please type in hostname of the machine to $CMD: " +read HOSTNAME_USER || : + +[ "$HOSTNAME_USER" = "$HOSTNAME" ] || sigh + +trap - 1 2 3 9 10 12 15 + +do_real_cmd