diff --git a/packaging/deb/debian/mackerel-agent.init b/packaging/deb/debian/mackerel-agent.init index 2f2099df7..e06ab6d29 100644 --- a/packaging/deb/debian/mackerel-agent.init +++ b/packaging/deb/debian/mackerel-agent.init @@ -19,7 +19,7 @@ SCRIPTNAME=/etc/init.d/$NAME LOGFILE=${LOGILE:="/var/log/$NAME.log"} PIDFILE=${PIDFILE:="/var/run/$NAME.pid"} ROOT=${ROOT:="/var/lib/$NAME"} -MACKREL_PLUGIN_WORKDIR=${MACKREL_PLUGIN_WORKDIR:="/var/tmp/$NAME"} +MACKEREL_PLUGIN_WORKDIR=${MACKEREL_PLUGIN_WORKDIR:="/var/tmp/$NAME"} if [ "$HTTP_PROXY" != "" ]; then export HTTP_PROXY=$HTTP_PROXY @@ -37,8 +37,8 @@ fi # do_start() { - mkdir -m 777 -p $MACKREL_PLUGIN_WORKDIR - MACKREL_PLUGIN_WORKDIR=$MACKREL_PLUGIN_WORKDIR $DAEMON ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 & + mkdir -m 777 -p $MACKEREL_PLUGIN_WORKDIR + MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $DAEMON ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 & sleep 3 kill -0 $(cat $PIDFILE 2>/dev/null) >/dev/null 2>&1 return $? diff --git a/packaging/rpm/src/mackerel-agent.initd b/packaging/rpm/src/mackerel-agent.initd index c2959031b..1e2d623c4 100644 --- a/packaging/rpm/src/mackerel-agent.initd +++ b/packaging/rpm/src/mackerel-agent.initd @@ -24,7 +24,7 @@ BIN=${BIN:="/usr/bin/$prog"} LOGFILE=${LOGILE:="/var/log/$prog.log"} PIDFILE=${PIDFILE:="/var/run/$prog.pid"} ROOT=${ROOT:="/var/lib/$prog"} -MACKREL_PLUGIN_WORKDIR=${MACKREL_PLUGIN_WORKDIR:="/var/tmp/$prog"} +MACKEREL_PLUGIN_WORKDIR=${MACKEREL_PLUGIN_WORKDIR:="/var/tmp/$prog"} if [ "$HTTP_PROXY" != "" ]; then export HTTP_PROXY=$HTTP_PROXY @@ -42,8 +42,8 @@ start() { [ -x $exec ] || exit 5 echo -n $"Starting $prog:" - mkdir -m 777 -p $MACKREL_PLUGIN_WORKDIR - MACKREL_PLUGIN_WORKDIR=$MACKREL_PLUGIN_WORKDIR $BIN ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 & + mkdir -m 777 -p $MACKEREL_PLUGIN_WORKDIR + MACKEREL_PLUGIN_WORKDIR=$MACKEREL_PLUGIN_WORKDIR $BIN ${APIBASE:+--apibase=$APIBASE} ${APIKEY:+--apikey=$APIKEY} --pidfile=$PIDFILE --root=$ROOT $OTHER_OPTS >>$LOGFILE 2>&1 & sleep 3 if ! kill -0 $(cat $PIDFILE 2>/dev/null) >/dev/null 2>&1; then failure