fix argument parsing

[code/molly-guard.git] / shutdown.in

diff --git a/shutdown.in b/shutdown.in
index 32ba58d8fc299c970889cddc2c7bcacbb1dc680e..73d2c154742fa9a5edf52e5f260ab76329ced9bd 100755 (executable)
--- a/shutdown.in
+++ b/shutdown.in
@@ -10,7 +10,7 @@ set -eu
 ME=molly-guard
 VERSION=0.4
 
-SCRIPTSDIR="@ETC_PREFIX@/etc/$ME/run.d"
+SCRIPTSDIR="@ETCDIR@/run.d"
 
 CMD="${0##*/}"
 EXEC="/sbin/$CMD"
@@ -71,9 +71,9 @@ for arg in "$@"; do
     --) END_OF_ARGS=1;;
     *) 
       if [ $END_OF_ARGS -eq 0 ]; then
-        CMDARGS="${args:+$args }$arg"
+        CMDARGS="${CMDARGS:+$CMDARGS }$arg"
       else
-        SCRIPTARGS="${args:+$args }--arg $arg"
+        SCRIPTARGS="${SCRIPTARGS:+$SCRIPTARGS }--arg $arg"
       fi
       ;;
   esac
@@ -104,7 +104,7 @@ esac
 
 MOLLYGUARD_CMD=$CMD; export MOLLYGUARD_CMD
 MOLLYGUARD_DO_NOTHING=$DO_NOTHING; export MOLLYGUARD_DO_NOTHING
-MOLLYGUARD_SETTINGS="@ETC_PREFIX@/etc/$ME/rc"; export MOLLYGUARD_SETTINGS
+MOLLYGUARD_SETTINGS="@ETCDIR@/rc"; export MOLLYGUARD_SETTINGS
 
 for script in $(run-parts --test $SCRIPTSDIR); do
   ret=0