]> git.madduck.net Git - code/molly-guard.git/blobdiff - shutdown

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

various improvements
[code/molly-guard.git] / shutdown
index 65fd374b2dfd87e8050394085ae2f07941bb9606..cb567c299405b772656b8249f7140168bab0c86c 100755 (executable)
--- 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