Skip to content

Commit

Permalink
oops... s/MACKREL_PLUGIN_WORKDIR/MACKEREL_PLUGIN_WORKDIR/g
Browse files Browse the repository at this point in the history
  • Loading branch information
Songmu committed Oct 17, 2016
1 parent 7c12c95 commit 5c4c59f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions packaging/deb/debian/mackerel-agent.init
Expand Up @@ -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
Expand All @@ -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 $?
Expand Down
6 changes: 3 additions & 3 deletions packaging/rpm/src/mackerel-agent.initd
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 5c4c59f

Please sign in to comment.