From 57367ce98c2cfcc67444ea38e0e182f2a5a9ab45 Mon Sep 17 00:00:00 2001 From: Lars Kruse Date: Wed, 1 Aug 2018 23:04:43 +0200 Subject: [PATCH] Plugin qstatcod4and5_: fix shellcheck issues --- plugins/other/qstatcod4and5_ | 125 +++++++++++++++++------------------ 1 file changed, 61 insertions(+), 64 deletions(-) diff --git a/plugins/other/qstatcod4and5_ b/plugins/other/qstatcod4and5_ index e60d9156..cf027e34 100755 --- a/plugins/other/qstatcod4and5_ +++ b/plugins/other/qstatcod4and5_ @@ -1,45 +1,43 @@ #!/bin/sh ################################################################# # Title : Qstat plugin for Munin # -# Author : Benjamin DUPUIS - Poil # -# Email : poil@quake.fr # -# First release : 18/10/2007 # +# Author : Benjamin DUPUIS - Poil # +# Email : poil@quake.fr # +# First release : 18/10/2007 # #---------------------------------------------------------------# -# Edited: Rouven David Naßl - peperoni # -# Edit : 09/01/2009 # -# Plugin edited for COD4+COD5 # -# Email: peperoni@sac-esports.de # +# Edited: Rouven David Naßl - peperoni # +# Edit : 09/01/2009 # +# Plugin edited for COD4+COD5 # +# Email: peperoni@sac-esports.de # #---------------------------------------------------------------# ################################################################# -# Variable : # +# Variable : # #---------------------------------------------------------------# -# Set path to QSTAT # -qstat_exe='/usr/local/bin/qstat' # -# Set the Group for munin to be displayed e.x. games or COD4 # -munin_group='games' # +# Set path to QSTAT # +qstat_exe='/usr/local/bin/qstat' # #---------------------------------------------------------------# # End of config -script_name=$(basename $0) +script_name=$(basename "$0") ################################################################# ################################################################# -# Help # +# Help # #---------------------------------------------------------------# usage() { - echo 'For testing the script, run qstatcod4and5_ cods IP PORT' - echo ' - GameType : cods ... run qstat for seeing available gametype' - echo 'For munin you must ln -s /usr/share/munin/plugins/qstatcod4and5_ /etc/munin/plugins/cod4_cods_IP_PORT' - echo 'Example you will test this COD4 Server: 123.456.789.123:28960' - echo 'your symlink looks like this: ln -s /usr/share/munin/plugins/cod4server /etc/munin/plugins/cod4_cods_123.456.789.123_28960' - echo 'Perhaps you must have to set qstat_exe path, actually on'${qstat_exe}; - echo 'Have Fun' + echo 'For testing the script, run qstatcod4and5_ cods IP PORT' + echo ' - GameType : cods ... run qstat for seeing available gametype' + echo 'For munin you must ln -s /usr/share/munin/plugins/qstatcod4and5_ /etc/munin/plugins/cod4_cods_IP_PORT' + echo 'Example you will test this COD4 Server: 123.456.789.123:28960' + echo 'your symlink looks like this: ln -s /usr/share/munin/plugins/cod4server /etc/munin/plugins/cod4_cods_123.456.789.123_28960' + echo 'Perhaps you must have to set qstat_exe path, actually on'${qstat_exe}; + echo 'Have Fun' } config() { - if [ "${script_name}" != "qstatcod4and5_" ]; then - gametype=$(echo ${script_name} | cut -d_ -f2) - ip=$(echo ${script_name} | cut -d_ -f3) - port=$(echo ${script_name} | cut -d_ -f4) + if [ "${script_name}" != "qstatcod4and5_" ]; then + gametype=$(echo "$script_name" | cut -d_ -f2) + ip=$(echo "$script_name" | cut -d_ -f3) + port=$(echo "$script_name" | cut -d_ -f4) else gametype=$1 ip=$2 @@ -48,56 +46,55 @@ config() { echo "graph_title Number of players on ${gametype} - ${ip}:${port} graph_vlabel players -graph_category ${munin_group} +graph_category games player.label players" } ################################################################# -# Quake Stat, call qstat # +# Quake Stat, call qstat # #---------------------------------------------------------------# quake_stat() { - if [ "${script_name}" != "qstatcod4and5_" ]; then - gametype=$(echo ${script_name} | cut -d_ -f2) - ip=$(echo ${script_name} | cut -d_ -f3) - port=$(echo ${script_name} | cut -d_ -f4) - else - gametype=$1 - ip=$2 - port=$3 - fi + if [ "${script_name}" != "qstatcod4and5_" ]; then + gametype=$(echo "$script_name" | cut -d_ -f2) + ip=$(echo "$script_name" | cut -d_ -f3) + port=$(echo "$script_name" | cut -d_ -f4) + else + gametype=$1 + ip=$2 + port=$3 + fi - if [ ! -z ${gametype} ] && [ ! -z ${gametype} ] && [ ! -z ${gametype} ]; then - dummy=$(${qstat_exe} -P -pa -sort P -${gametype} ${ip}:${port} | grep frags | wc -l) - playervalue=$dummy - - if [ -z "${playervalue}" ]; then - playervalue=0 - fi + if [ ! -z "$gametype" ] && [ ! -z "$gametype" ] && [ ! -z "$gametype" ]; then + dummy=$("$qstat_exe" -P -pa -sort P "-$gametype" "${ip}:${port}" | grep frags | wc -l) + playervalue=$dummy - echo "player.value "${playervalue}; - else - echo "player.value U" - fi + if [ -z "$playervalue" ]; then + playervalue=0 + fi + + echo "player.value $playervalue" + else + echo "player.value U" + fi } ################################################################# -# Main # +# Main # #---------------------------------------------------------------# case $1 in - config) - config - exit 0 - ;; - help | ?) - usage - exit 0 - ;; - autoconf) - echo "no (edit the script for set qstat path)" - ;; - *) - quake_stat $1 $2 $3 - exit 0 - ;; + config) + config "$1" "$2" "$3" + exit 0 + ;; + help | ?) + usage + exit 0 + ;; + autoconf) + echo "no (edit the script for set qstat path)" + ;; + *) + quake_stat "$1" "$2" "$3" + exit 0 + ;; esac -