]> 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:

reformat help output
[code/molly-guard.git] / shutdown
index 387aacb024b2e4c869028c1d633ce290239370bb..f12fde0fdb8ae5ca059af3d9318901a98bdede3f 100755 (executable)
--- a/shutdown
+++ b/shutdown
@@ -5,11 +5,10 @@
 # Copyright © martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-# $Id: shutdown 299 2006-10-16 14:40:47Z madduck $
-#
 set -eu
 
 ME=molly-guard
+CHECKSDIR=/etc/molly-guard/checks.d
 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"
@@ -41,11 +40,11 @@ usage()
         to guard against accidental shutdowns/reboots.
 
         Some of the checks available are:
-         - Prompt the user for the machine's if the current shell is a child
-           of an SSH connection (or --pretend-ssh) has been given on the
-           command line, if the shell is connected to an interactive
-          terminal, and the actual command to execute is does not involve
-           --help or is \`shutdown -c'.
+        - Prompt the user for the machine's if the current shell is a child
+          of an SSH connection (or --pretend-ssh) has been given on the
+          command line, if the shell is connected to an interactive
+         terminal, and the actual command to execute is does not involve
+          --help or is \`shutdown -c'.
 
          $ME will always interpose the prompt if the environment variable
           ALWAYS_MOLLY is set to '1'.  This variable may be set in the file
@@ -107,7 +106,7 @@ case "$CMD $ARGS" in
     ;;
 esac
 
-run-parts --exit-on-error --arg $CMD $CHECK_ARGS /usr/share/molly-guard/checks.d
+run-parts --exit-on-error --arg $CMD $CHECK_ARGS /etc/molly-guard/checks.d
 
 # run-parts won't return to us if there are failures, but I'm paranoid.
 if [ $? == 0 ]; then