From: madduck <madduck@19660600-52fe-0310-9875-adc0d7a7b53c>
Date: Thu, 19 Oct 2006 16:18:36 +0000 (+0000)
Subject: * New upstream release, which does better shell quoting.
X-Git-Tag: 0.2.1
X-Git-Url: https://git.madduck.net/code/molly-guard.git/commitdiff_plain/dcbf7f8246ed6cdcd3f84909eef79b78b1dfa6ec

* New upstream release, which does better shell quoting.
* New upstream release, which handles --help related options better.
---

diff --git a/shutdown b/shutdown
index cb567c2..c9b34f2 100755
--- a/shutdown
+++ b/shutdown
@@ -36,11 +36,11 @@ do_real_cmd()
 {
   case "$ARGS" in
     (*--molly-guard-do-nothing*)
-      ARGS0="${ARGS%%--molly-guard-do-nothing*}"
+      ARGS0="${ARGS%% --molly-guard-do-nothing*}"
       ARGS1="${ARGS##*--molly-guard-do-nothing}"
-      echo "$ME: would run: $EXEC $ARGS0 $ARGS1"
+      echo "$ME: would run: $EXEC $ARGS0 ${ARGS1# }"
       exit 0;;
-    *) exec $EXEC "$ARGS";;
+    *) eval exec $EXEC "$ARGS";;
   esac
 }
 
@@ -51,7 +51,8 @@ test -t 0                    || do_real_cmd
 # pass through help commands
 case "$CMD $ARGS" in
   (shutdown\ *-c*) do_real_cmd;;
-  (*-h*) do_real_cmd;;
+  (shutdown\ *-h*) do_real_cmd;;
+  (*--help*) do_real_cmd;;
   *) :;;
 esac