From 570002cfcef9a7dfde3a72a69ede759951a6bea8 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 24 May 2016 15:05:05 -0500 Subject: [PATCH 1/4] Dang type-o --- lgsm/functions/command_stop.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/command_stop.sh b/lgsm/functions/command_stop.sh index d7b9ddd33..13236d0ae 100644 --- a/lgsm/functions/command_stop.sh +++ b/lgsm/functions/command_stop.sh @@ -173,7 +173,7 @@ fn_stop_ark(){ fi if [[ ${#queryport} -gt 0 ]] ; then - for (( pidcheck=0 ; pidcheck < ${MADPIDITER} ; pidcheck++ )) ; do + for (( pidcheck=0 ; pidcheck < ${MAXPIDITER} ; pidcheck++ )) ; do pid=$(netstat -nap 2>/dev/null | grep ^udp[[:space:]] |\ grep :${queryport}[[:space:]] | rev | awk '{print $1}' |\ rev | cut -d\/ -f1) From 552554627cf170fdc5856f73c6144841f29f2490 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 24 May 2016 15:14:11 -0500 Subject: [PATCH 2/4] testing stdbuf as an unbuffer replacement --- lgsm/functions/command_validate.sh | 4 +++- lgsm/functions/install_server_files.sh | 6 ++++-- lgsm/functions/update_dl.sh | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 10e3bfa5d..6c852aeb6 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -22,7 +22,9 @@ fn_validation(){ cd "${rootdir}/steamcmd" - if [ $(command -v unbuffer) ]; then + if [ $(command -v stdbuf) ]; then + unbuffer="stdbuf -i0 -o0 -e0" + elif [ $(command -v unbuffer) ]; then unbuffer=unbuffer fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index cf31e355c..1a852bd7b 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -43,7 +43,9 @@ fn_install_server_files_steamcmd(){ fi # Detects if unbuffer command is available. - if [ $(command -v unbuffer) ]; then + if [ $(command -v stdbuf) ]; then + unbuffer="stdbuf -i0 -o0 -e0" + elif [ $(command -v unbuffer) ]; then unbuffer=unbuffer fi @@ -107,4 +109,4 @@ if [ -z "${autoinstall}" ]; then * ) echo "Please answer yes or no.";; esac done -fi \ No newline at end of file +fi diff --git a/lgsm/functions/update_dl.sh b/lgsm/functions/update_dl.sh index 1ccd3e8d5..d055bba58 100644 --- a/lgsm/functions/update_dl.sh +++ b/lgsm/functions/update_dl.sh @@ -14,7 +14,9 @@ fn_steamcmd_dl(){ cd "steamcmd" # Detects if unbuffer command is available. - if [ $(command -v unbuffer) ]; then + if [ $(command -v stdbuf) ]; then + unbuffer="stdbuf -i0 -o0 -e0" + elif [ $(command -v unbuffer) ]; then unbuffer=unbuffer fi From be315b3b3d19065f9e4d210344055c04944876f7 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 24 May 2016 16:10:45 -0500 Subject: [PATCH 3/4] Use unbuffer if present first, then try stdbuf --- lgsm/functions/command_validate.sh | 6 +++--- lgsm/functions/install_server_files.sh | 6 +++--- lgsm/functions/update_dl.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index 6c852aeb6..71433a7b6 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -22,10 +22,10 @@ fn_validation(){ cd "${rootdir}/steamcmd" - if [ $(command -v stdbuf) ]; then - unbuffer="stdbuf -i0 -o0 -e0" - elif [ $(command -v unbuffer) ]; then + if [ $(command -v unbuffer) ]; then unbuffer=unbuffer + elif [ $(command -v stdbuf) ]; then + unbuffer="stdbuf -i0 -o0 -e0" fi if [ "${engine}" == "goldsource" ]; then diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 1a852bd7b..ffe0284a3 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -43,10 +43,10 @@ fn_install_server_files_steamcmd(){ fi # Detects if unbuffer command is available. - if [ $(command -v stdbuf) ]; then - unbuffer="stdbuf -i0 -o0 -e0" - elif [ $(command -v unbuffer) ]; then + if [ $(command -v unbuffer) ]; then unbuffer=unbuffer + elif [ $(command -v stdbuf) ]; then + unbuffer="stdbuf -i0 -o0 -e0" fi if [ "${counter}" -le "4" ]; then diff --git a/lgsm/functions/update_dl.sh b/lgsm/functions/update_dl.sh index d055bba58..5a40c802f 100644 --- a/lgsm/functions/update_dl.sh +++ b/lgsm/functions/update_dl.sh @@ -14,10 +14,10 @@ fn_steamcmd_dl(){ cd "steamcmd" # Detects if unbuffer command is available. + if [ $(command -v unbuffer) ]; then + unbuffer=unbuffer if [ $(command -v stdbuf) ]; then unbuffer="stdbuf -i0 -o0 -e0" - elif [ $(command -v unbuffer) ]; then - unbuffer=unbuffer fi if [ "${engine}" == "goldsource" ]; then From 6fd13b734db56c30f882e51c5a638ea88717e717 Mon Sep 17 00:00:00 2001 From: cedarlug Date: Tue, 24 May 2016 16:12:59 -0500 Subject: [PATCH 4/4] elif not if --- lgsm/functions/update_dl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/update_dl.sh b/lgsm/functions/update_dl.sh index 5a40c802f..466e06d7c 100644 --- a/lgsm/functions/update_dl.sh +++ b/lgsm/functions/update_dl.sh @@ -16,7 +16,7 @@ fn_steamcmd_dl(){ # Detects if unbuffer command is available. if [ $(command -v unbuffer) ]; then unbuffer=unbuffer - if [ $(command -v stdbuf) ]; then + elif [ $(command -v stdbuf) ]; then unbuffer="stdbuf -i0 -o0 -e0" fi