From 3e5254000ab7abe3780075fc4e73564f25f0b1ba Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Fri, 30 Oct 2015 22:18:55 +0000 Subject: [PATCH] Revert "as per https://github.com/koalaman/shellcheck/wiki/SC2060" This reverts commit 1c84eff59edb5406ee4d0ccf0b086b2d0db8b32e. --- functions/fn_details | 2 +- functions/fn_details_config | 2 +- functions/fn_install_glibcfix | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/fn_details b/functions/fn_details index a69830fa9..ea408876d 100644 --- a/functions/fn_details +++ b/functions/fn_details @@ -154,7 +154,7 @@ printf '%*s\n' "${COLUMNS:-$(tput cols)}" '' | tr ' ' = # GLIBC required if [ -n "${glibcrequired}" ]; then - if [ "$(ldd --version | sed -n '1 p' | tr -cd '[:digit:]' | tail -c 3)" -lt "$(echo "${glibcrequired}" | sed -n '1 p' | tr -cd '[:digit:]' | tail -c 3)" ]; then + if [ "$(ldd --version | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" -lt "$(echo "${glibcrequired}" | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" ]; then if [ "${glibcfix}" == "yes" ]; then echo -e "\e[34mGLIBC required:\t\e[0;31m${glibcrequired} \e[0m(\e[0;32mUsing GLIBC fix\e[0m)" else diff --git a/functions/fn_details_config b/functions/fn_details_config index 815153f23..1a6119e7f 100644 --- a/functions/fn_details_config +++ b/functions/fn_details_config @@ -8,7 +8,7 @@ ## Examples of filtering to get info from config files # sed 's/foo//g' - remove foo -# tr -cd '[:digit:]' leave only digits +# tr -cd [:digit:] leave only digits # tr -d '=\"; ' remove selected charectors =\"; # grep -v "foo" filter out lines that contain foo diff --git a/functions/fn_install_glibcfix b/functions/fn_install_glibcfix index 18f1b0840..52868e908 100644 --- a/functions/fn_install_glibcfix +++ b/functions/fn_install_glibcfix @@ -2,7 +2,7 @@ # LGSM fn_install_glibcfix function # Author: Daniel Gibbs # Website: http://gameservermanagers.com -# Version: 301015 +# Version: 050715 fn_glibcfixmsg(){ echo "" @@ -48,7 +48,7 @@ if [ -z $(command -v ldd) ]; then esac done # if Glibc less than 1.15 -elif [ "$(ldd --version | sed -n '1 p' | tr -cd '[:digit:]' | tail -c 3)" -lt 215 ]; then +elif [ "$(ldd --version | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" -lt 215 ]; then # Blade Symphony if [ "${gamename}" == "Blade Symphony" ]; then glibcversion="2.15" @@ -110,7 +110,7 @@ elif [ "$(ldd --version | sed -n '1 p' | tr -cd '[:digit:]' | tail -c 3)" -lt 21 wget -nv -N https://github.com/dgibbs64/linuxgsm/raw/master/NoMoreRoomInHell/dependencies/libm.so.6 cp -v "${rootdir}/steamcmd/linux32/libstdc++.so.6" "${filesdir}/libstdc++.so.6" # if Glibc less than 1.13 - elif [ "$(ldd --version | sed -n '1 p' | tr -cd '[:digit:]' | tail -c 3)" -lt 213 ]; then + elif [ "$(ldd --version | sed -n '1 p' | tr -cd [:digit:] | tail -c 3)" -lt 213 ]; then # ARMA 3 if [ "${gamename}" == "ARMA 3" ]; then glibcversion="2.13"