From 44bbcf6917052b55ea1bab33b5f103b4ffec1d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20=27DaMaxx=27=20B=C3=BChring?= Date: Wed, 22 Jun 2016 13:31:23 +0200 Subject: [PATCH] removed 'unbuffer' completely and replaced it with stdbuf --- lgsm/functions/command_validate.sh | 4 +--- lgsm/functions/install_server_files.sh | 14 ++++++-------- lgsm/functions/update_dl.sh | 4 +--- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lgsm/functions/command_validate.sh b/lgsm/functions/command_validate.sh index d31154ec3..ffaa0de45 100644 --- a/lgsm/functions/command_validate.sh +++ b/lgsm/functions/command_validate.sh @@ -22,9 +22,7 @@ fn_validation(){ cd "${rootdir}/steamcmd" - if [ $(command -v unbuffer) ]; then - unbuffer=unbuffer - elif [ $(command -v stdbuf) ]; then + if [ $(command -v stdbuf) ]; then unbuffer="stdbuf -i0 -o0 -e0" fi diff --git a/lgsm/functions/install_server_files.sh b/lgsm/functions/install_server_files.sh index 1f305f06c..bb03d6a5c 100644 --- a/lgsm/functions/install_server_files.sh +++ b/lgsm/functions/install_server_files.sh @@ -45,26 +45,24 @@ fn_install_server_files_steamcmd(){ fi # Detects if unbuffer command is available. - if [ $(command -v unbuffer) ]; then - unbuffer=unbuffer - elif [ $(command -v stdbuf) ]; then + if [ $(command -v stdbuf) ]; then unbuffer="stdbuf -i0 -o0 -e0" fi if [ "${counter}" -le "4" ]; then if [ "${engine}" == "goldsource" ]; then - ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} +quit local exitcode=$? else - ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" +quit local exitcode=$? fi elif [ "${counter}" -ge "5" ]; then if [ "${engine}" == "goldsource" ]; then - ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} -validate +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod "${appidmod}" +app_update "${appid}" ${branch} -validate +quit local exitcode=$? else - ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_update "${appid}" -validate +quit local exitcode=$? fi fi @@ -82,7 +80,7 @@ fn_install_server_files_steamcmd(){ counter="0" while [ "${counter}" -le "4" ]; do counter=$((counter+1)) - ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" -validate +quit + ${unbuffer} ./steamcmd.sh +login "${steamuser}" "${steampass}" +force_install_dir "${filesdir}" +app_set_config 90 mod ${appidmod} +app_update "${appid}" -validate +quit local exitcode=$? done fi diff --git a/lgsm/functions/update_dl.sh b/lgsm/functions/update_dl.sh index 0adda4991..a72322952 100644 --- a/lgsm/functions/update_dl.sh +++ b/lgsm/functions/update_dl.sh @@ -14,9 +14,7 @@ fn_steamcmd_dl(){ cd "steamcmd" # Detects if unbuffer command is available. - if [ $(command -v unbuffer) ]; then - unbuffer=unbuffer - elif [ $(command -v stdbuf) ]; then + if [ $(command -v stdbuf) ]; then unbuffer="stdbuf -i0 -o0 -e0" fi