fix(install): resolve steamcmd dependency issues (#3583)

dgibbs64 · web-flow · commit 490cd3fa5aea · 2021-09-28T22:51:41.000+01:00
* fix(install): improve steamcmd detection
diff --git a/lgsm/data/almalinux-8.csv b/lgsm/data/almalinux-8.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/centos-7.csv b/lgsm/data/centos-7.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/centos-8.csv b/lgsm/data/centos-8.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
diff --git a/lgsm/data/debian-10.csv b/lgsm/data/debian-10.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-11-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-11-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/debian-11.csv b/lgsm/data/debian-11.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc-s1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-16-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-16-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/debian-9.csv b/lgsm/data/debian-9.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-8-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-8-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/rhel-7.csv b/lgsm/data/rhel-7.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/rhel-8.csv b/lgsm/data/rhel-8.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/rocky-8.csv b/lgsm/data/rocky-8.csv
@@ -1,4 +1,5 @@
-all,epel-release,curl,wget,util-linux,python36,file,tar,gzip,bzip2,unzip,xz,binutils,bc,jq,tmux,nmap-ncat,cpio,hostname
+all,bc,binutils,bzip2,bzip2,cpio,curl,epel-release,file,glibc.i686,gzip,hostname,jq,libstdc++.i686,nmap-ncat,python36,tar,tmux,unzip,util-linux,wget,xz
+steamcmd,glibc.i686,libstdc++.i686
 ac
 ahl
 ahl2
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven
 terraria
 tf2,libcurl.i686
diff --git a/lgsm/data/ubuntu-16.04.csv b/lgsm/data/ubuntu-16.04.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-8-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-8-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/ubuntu-18.04.csv b/lgsm/data/ubuntu-18.04.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-11-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-11-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/ubuntu-20.04.csv b/lgsm/data/ubuntu-20.04.csv
@@ -1,5 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc1,lib32stdc++6,hostname
-steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -69,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-16-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-16-jre,rng-tools
 q2
 q3
 ql
@@ -97,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/data/ubuntu-21.04.csv b/lgsm/data/ubuntu-21.04.csv
@@ -1,4 +1,5 @@
-all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,jq,python3,tar,tmux,util-linux,netcat,unzip,xz-utils,lib32gcc-s1,lib32stdc++6,hostname
+all,bc,binutils,bsdmainutils,bzip2,ca-certificates,cpio,curl,file,gzip,hostname,jq,lib32gcc-s1,lib32stdc++6,netcat,netcat,python3,tar,tmux,unzip,util-linux,wget,xz-utils
+steamcmd,lib32gcc-s1,lib32stdc++6,libsdl2-2.0-0:i386,steamcmd
 ac
 ahl
 ahl2
@@ -68,14 +69,14 @@ nmrih,libtinfo5:i386
 ns
 ns2,speex,libtbb2
 ns2c,speex:i386,libtbb2
-onset
+onset,libmariadbclient-dev
 opfor
 pc
 pmc,openjdk-16-jre
 pstbs,libgconf-2-4
 pvkii
 pvr,libc++1
-pz
+pz,openjdk-16-jre,rng-tools
 q2
 q3
 ql
@@ -96,6 +97,7 @@ sof2
 sol
 squad
 st
+stn
 sven,libssl1.1:i386,zlib1g:i386
 terraria
 tf2,libcurl4-gnutls-dev:i386
diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh
@@ -173,6 +173,11 @@ fn_install_missing_deps(){
 				eval "${cmd}"
 			fi
 			autodepinstall="$?"
+
+			# If auto install passes remove steamcmd install failure.
+			if [ "${autodepinstall}" == "0" ]; then
+				unset steamcmdfail
+			fi
 		fi
 
 		# If automatic dependency install is unavailable.
@@ -217,8 +222,14 @@ fn_check_loop(){
 
 # Checks if dependency is installed or not.
 fn_deps_detector(){
+	## Check.
+	# SteamCMD: Will be removed from required array if non-free repo is not available.
+	# This will cause SteamCMD to be installed using tar.
+	if [ "${deptocheck}" == "steamcmd" ]&&[ "${distroid}" == "debian" ]&& ! grep -qE "^deb .*non-free" /etc/apt/sources.list; then
+		array_deps_required=( "${array_deps_required[@]/steamcmd}" )
+		steamcmdstatus=1
 	# Java: Added for users using Oracle JRE to bypass check.
-	if [[ ${deptocheck} == "openjdk"* ]]||[[ ${deptocheck} == "java"* ]]; then
+	elif [[ ${deptocheck} == "openjdk"* ]]||[[ ${deptocheck} == "java"* ]]; then
 		# Is java already installed?
 		if [ -n "${javaversion}" ]; then
 			# Added for users using Oracle JRE to bypass check.
@@ -249,25 +260,28 @@ fn_deps_detector(){
 		depstatus=$?
 	fi
 
-	if [ "${depstatus}" == "0" ]; then
+	# Outcome of Check.
+	if [ "${steamcmdstatus}" == "1" ]; then
+		# If SteamCMD is not available in repo dont check for it.
+		unset steamcmdstatus
+	elif [ "${depstatus}" == "0" ]; then
 		# If dependency is found.
 		missingdep=0
 		if [ "${commandname}" == "INSTALL" ]; then
 			echo -e "${green}${deptocheck}${default}"
 			sleep 0.1
 		fi
-	else
+	elif [ "${depstatus}" != "0" ]; then
 		# If dependency is not found.
 		missingdep=1
 		if [ "${commandname}" == "INSTALL" ]; then
 			echo -e "${red}${deptocheck}${default}"
 			sleep 0.1
 		fi
-		# Define required dependencies for SteamCMD.
+		# If SteamCMD requirements are not met install will fail.
 		if [ -n "${appid}" ]; then
-				array_steamcmd_deps_required=("${depsteamcmd}")
-				for steamcmddeptocheck in ${array_steamcmd_deps_required[*]}; do
-					if [ "${deptocheck}" ==  "${steamcmddeptocheck}" ]; then
+				for steamcmddeptocheck in ${array_deps_required_steamcmd[*]}; do
+					if [ "${deptocheck}" != "steamcmd" ]&&[ "${deptocheck}" == "${steamcmddeptocheck}" ]; then
 						steamcmdfail=1
 					fi
 				done
@@ -298,13 +312,6 @@ fi
 
 info_distro.sh
 
-# some RHEL based distros use 8.4 instead of just 8.
-if [[ "${distroidlike}" == *"rhel"* ]]||[ "${distroid}" == "rhel" ]; then
-	distroversioncsv="${distroversionrh}"
-else
-	distroversioncsv="${distroversion}"
-fi
-
 if [ ! -f "${tmpdir}/dependency-no-check.tmp" ]&&[ ! -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
 	# Check that the disto dependency csv file exists.
 	fn_check_file_github "lgsm/data" "${distroid}-${distroversioncsv}.csv"
@@ -323,6 +330,7 @@ if [ -f "${datadir}/${distroid}-${distroversioncsv}.csv" ]; then
 	array_deps_missing=()
 
 	array_deps_required=("${depall} ${depsteamcmd} ${depshortname}")
+	array_deps_required_steamcmd=("${depsteamcmd}")
 	fn_deps_email
 	# Unique sort dependency array.
 	IFS=" " read -r -a array_deps_required <<< "$(echo "${array_deps_required[@]}" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
diff --git a/lgsm/functions/command_update_linuxgsm.sh b/lgsm/functions/command_update_linuxgsm.sh
diff --git a/lgsm/functions/info_distro.sh b/lgsm/functions/info_distro.sh
