From b925a10155b05e93eaea9c8cbcc3d0cfa2fb6b0d Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Thu, 2 Aug 2018 00:09:36 +0200 Subject: [PATCH] Plugin proftpd_bytes: fix shellcheck issues --- plugins/ftp/proftpd_bytes | 50 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/plugins/ftp/proftpd_bytes b/plugins/ftp/proftpd_bytes index 730e4d44..a4086347 100755 --- a/plugins/ftp/proftpd_bytes +++ b/plugins/ftp/proftpd_bytes @@ -14,50 +14,48 @@ #%# family=auto #%# capabilities=autoconf -MAXLABEL=20 mktempfile () { -mktemp -t $1 -} + mktemp -t "$1" +} LOGFILE=${logfile:-/var/log/proftpd/xferlog} -LOGTAIL=${logtail:-`which logtail`} +LOGTAIL=${logtail:-$(which logtail)} STATEFILE=$MUNIN_PLUGSTATE/xferlog-bytes.offset if [ "$1" = "autoconf" ]; then - if [ -f "${LOGFILE}" -a -n "${LOGTAIL}" -a -x "${LOGTAIL}" ] ; then - echo yes - else - echo "no (missing logfile or 'logtail' executable)" - fi - exit 0 + if [ -f "$LOGFILE" ] && [ -n "$LOGTAIL" ] && [ -x "$LOGTAIL" ] ; then + echo yes + else + echo "no (missing logfile or 'logtail' executable)" + fi + exit 0 fi if [ "$1" = "config" ]; then - echo 'graph_title FTP Server Bytes' - echo 'graph_args --base 1000 -l 0' - echo 'graph_vlabel FTP Server Bytes' - echo 'graph_category network' - echo 'ftp_get.label Bytes GET' - echo 'ftp_put.label Bytes PUT' - exit 0 + echo 'graph_title FTP Server Bytes' + echo 'graph_args --base 1000 -l 0' + echo 'graph_vlabel FTP Server Bytes' + echo 'graph_category network' + echo 'ftp_get.label Bytes GET' + echo 'ftp_put.label Bytes PUT' + exit 0 fi ftp_get=U ftp_put=U -TEMP_FILE=`mktempfile munin-xferlog-bytes.XXXXXX` +TEMP_FILE=$(mktempfile munin-xferlog-bytes.XXXXXX) -if [ -n "$TEMP_FILE" -a -f "$TEMP_FILE" ] +if [ -n "$TEMP_FILE" ] && [ -f "$TEMP_FILE" ] then - $LOGTAIL ${LOGFILE} $STATEFILE | grep "[[:space:]][oi][[:space:]]" > ${TEMP_FILE} - ftp_get=`grep "[[:space:]]o[[:space:]]" ${TEMP_FILE} | awk '{s += $8} END { if ( s ) print s ; else print "0" }'` - ftp_put=`grep "[[:space:]]i[[:space:]]" ${TEMP_FILE} | awk '{s += $8} END { if ( s ) print s ; else print "0" }'` + "$LOGTAIL" "$LOGFILE" "$STATEFILE" | grep "[[:space:]][oi][[:space:]]" >"$TEMP_FILE" + ftp_get=$(grep "[[:space:]]o[[:space:]]" "$TEMP_FILE" | awk '{s += $8} END { if ( s ) print s ; else print "0" }') + ftp_put=$(grep "[[:space:]]i[[:space:]]" "$TEMP_FILE" | awk '{s += $8} END { if ( s ) print s ; else print "0" }') - /bin/rm -f $TEMP_FILE + /bin/rm -f "$TEMP_FILE" fi -echo "ftp_get.value ${ftp_get}" -echo "ftp_put.value ${ftp_put}" - +echo "ftp_get.value $ftp_get" +echo "ftp_put.value $ftp_put"