From b13d70b7627c8c7eca2521fbf96e1add121433c1 Mon Sep 17 00:00:00 2001 From: BourneID Date: Mon, 15 Oct 2018 18:09:10 +0100 Subject: [PATCH 1/6] Add JQ check for #1985 --- lgsm/functions/check_deps.sh | 53 ++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 5db883072..e0ed6ef40 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -95,6 +95,44 @@ fn_install_mono_repo(){ fi } +fn_install_universe_repo(){ + # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu + if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then + fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." + sleep 0.5 + sudo -v > /dev/null 2>&1 + if [ $? -eq 0 ]; then + fn_print_info_nl "Automatically adding Mono repository." + fn_script_log_info "Automatically adding Mono repository." + echo -en ".\r" + sleep 1 + echo -en "..\r" + sleep 1 + echo -en "...\r" + sleep 1 + echo -en " \r" + cmd="sudo apt-add-repository universe" + eval ${cmd} + if [ $? -eq 0 ]; then + fn_print_complete_nl "Installing universe repository completed." + fn_script_log_pass "Installing universe repository completed." + else + fn_print_failure_nl "Unable to install universe repository." + fn_script_log_fatal "Unable to install universe repository." + fi + else + fn_print_information_nl "Adding Universe Repo" + echo "" + fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository." + fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository." + echo " Please run the following command as a user with sudo access, and re-run the installation" + echo " sudo apt-add-repository universe" + fi + fi + +} + + fn_deps_detector(){ # Checks if dependency is missing if [ "${tmuxcheck}" == "1" ]; then @@ -107,8 +145,16 @@ fn_deps_detector(){ depstatus=0 deptocheck="${javaversion}" unset javacheck - elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then - jqstatus=1 + elif [ "${deptocheck}" == "jq" ]; then + if [ "${distroversion}" == "6" ]; then + jqstatus=1 + elsif [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]; then + #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default + #check if the universe exists and active + if ! grep -qE "^deb .*universe" /etc/apt/sources.list; then + jquniversemissing=1 + fi + end elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed @@ -191,6 +237,9 @@ fn_found_missing_deps(){ fn_print_warning_nl "jq is not available in the ${distroname} repository" echo " * https://github.com/GameServerManagers/LinuxGSM/wiki/jq" fi + if [ -n "${jquniversemissing}" ]; then + fn_install_universe_repo + fi sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_information_nl "Automatically installing missing dependencies." From 964daef084535fd9e713e2018a5a681858ed7493 Mon Sep 17 00:00:00 2001 From: BourneID Date: Mon, 15 Oct 2018 19:28:45 +0100 Subject: [PATCH 2/6] Fix logic #1985 --- lgsm/functions/check_deps.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index e0ed6ef40..6bc4f31d8 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -102,8 +102,8 @@ fn_install_universe_repo(){ sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then - fn_print_info_nl "Automatically adding Mono repository." - fn_script_log_info "Automatically adding Mono repository." + fn_print_info_nl "Automatically adding Universe repository." + fn_script_log_info "Automatically adding Universe repository." echo -en ".\r" sleep 1 echo -en "..\r" @@ -145,16 +145,13 @@ fn_deps_detector(){ depstatus=0 deptocheck="${javaversion}" unset javacheck - elif [ "${deptocheck}" == "jq" ]; then - if [ "${distroversion}" == "6" ]; then + elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then jqstatus=1 - elsif [ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]; then + elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then + depstatus=1 + jquniversemissing=1 #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default #check if the universe exists and active - if ! grep -qE "^deb .*universe" /etc/apt/sources.list; then - jquniversemissing=1 - fi - end elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed From f5159d505d25ceb785840904954f51ff506a0db2 Mon Sep 17 00:00:00 2001 From: BourneID Date: Mon, 15 Oct 2018 20:23:32 +0100 Subject: [PATCH 3/6] Minor logging adjustments --- lgsm/functions/check_deps.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 6bc4f31d8..b3d8798ca 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -99,11 +99,10 @@ fn_install_universe_repo(){ # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." + fn_print_dots "Adding Universe repository" sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then - fn_print_info_nl "Automatically adding Universe repository." - fn_script_log_info "Automatically adding Universe repository." echo -en ".\r" sleep 1 echo -en "..\r" @@ -129,10 +128,8 @@ fn_install_universe_repo(){ echo " sudo apt-add-repository universe" fi fi - } - fn_deps_detector(){ # Checks if dependency is missing if [ "${tmuxcheck}" == "1" ]; then From dc3a25e1e4c9b23415e530f33f1f3ad884afc797 Mon Sep 17 00:00:00 2001 From: BourneID Date: Mon, 15 Oct 2018 20:30:46 +0100 Subject: [PATCH 4/6] Minor logging adjustments --- lgsm/functions/check_deps.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index b3d8798ca..f95d7a457 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -99,7 +99,7 @@ fn_install_universe_repo(){ # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." - fn_print_dots "Adding Universe repository" + fn_print_information_nl "Attempting to add Universe Repo" sleep 0.5 sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then @@ -120,8 +120,6 @@ fn_install_universe_repo(){ fn_script_log_fatal "Unable to install universe repository." fi else - fn_print_information_nl "Adding Universe Repo" - echo "" fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository." fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository." echo " Please run the following command as a user with sudo access, and re-run the installation" From 490d8bce43b24e7810bc96db616cc62e73446415 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Oct 2018 20:48:29 +0100 Subject: [PATCH 5/6] tab --- lgsm/functions/check_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index f95d7a457..ab6f3e168 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -144,7 +144,7 @@ fn_deps_detector(){ jqstatus=1 elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then depstatus=1 - jquniversemissing=1 + jquniversemissing=1 #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default #check if the universe exists and active elif [ "${deptocheck}" == "mono-complete" ]; then From 460e50972ae4dedc88964561480f93cf4df8e96f Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 15 Oct 2018 20:56:52 +0100 Subject: [PATCH 6/6] converting from spaces to tabs --- lgsm/functions/check_deps.sh | 76 +++++++++++++----------------------- 1 file changed, 27 insertions(+), 49 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index ab6f3e168..24e20b35e 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -95,39 +95,6 @@ fn_install_mono_repo(){ fi } -fn_install_universe_repo(){ - # Defensive coding - As this is an ubuntu only issue then check to make sure this fix is needed, and we are using ubuntu - if [ "${jquniversemissing}" != "0" ]&&[ "${distroid}" == "ubuntu" ]; then - fn_print_warning_nl "Ubuntu 18.04.1 contains a bug which means the sources.list file does not populate with the Ubuntu universe repository." - fn_print_information_nl "Attempting to add Universe Repo" - sleep 0.5 - sudo -v > /dev/null 2>&1 - if [ $? -eq 0 ]; then - echo -en ".\r" - sleep 1 - echo -en "..\r" - sleep 1 - echo -en "...\r" - sleep 1 - echo -en " \r" - cmd="sudo apt-add-repository universe" - eval ${cmd} - if [ $? -eq 0 ]; then - fn_print_complete_nl "Installing universe repository completed." - fn_script_log_pass "Installing universe repository completed." - else - fn_print_failure_nl "Unable to install universe repository." - fn_script_log_fatal "Unable to install universe repository." - fi - else - fn_print_warning_nl "$(whoami) does not have sudo access. Manually add Universe repository." - fn_script_log_warn "$(whoami) does not have sudo access. Manually add Universe repository." - echo " Please run the following command as a user with sudo access, and re-run the installation" - echo " sudo apt-add-repository universe" - fi - fi -} - fn_deps_detector(){ # Checks if dependency is missing if [ "${tmuxcheck}" == "1" ]; then @@ -141,12 +108,7 @@ fn_deps_detector(){ deptocheck="${javaversion}" unset javacheck elif [ "${deptocheck}" == "jq" ]&&[ "${distroversion}" == "6" ]; then - jqstatus=1 - elif [ "${deptocheck}" == "jq" ]&&[ "${distroid}" == "ubuntu" ]&&[ "${distroversion}" == "18.04" ]&& ! grep -qE "^deb .*universe" /etc/apt/sources.list; then - depstatus=1 - jquniversemissing=1 - #1985 ubuntu 18.04.1 bug does not set sources.list correctly which means universe is not active by default - #check if the universe exists and active + jqstatus=1 elif [ "${deptocheck}" == "mono-complete" ]; then if [ "$(command -v mono 2>/dev/null)" ]&&[ "$(mono --version 2>&1 | grep -Po '(?<=version )\d')" -ge 5 ]; then # Mono >= 5.0.0 already installed @@ -217,10 +179,9 @@ fn_deps_email(){ fn_found_missing_deps(){ if [ "${#array_deps_missing[@]}" != "0" ]; then - fn_print_dots "Checking dependencies" - sleep 0.5 - fn_print_error_nl "Checking dependencies: missing: ${red}${array_deps_missing[@]}${default}" - fn_script_log_error "Checking dependencies: missing: ${array_deps_missing[@]}" + + fn_print_warning_nl "Missing dependencies: ${red}${array_deps_missing[@]}${default}" + fn_script_log_warn "Missing dependencies: ${array_deps_missing[@]}" sleep 0.5 if [ -n "${monostatus}" ]; then fn_install_mono_repo @@ -229,9 +190,6 @@ fn_found_missing_deps(){ fn_print_warning_nl "jq is not available in the ${distroname} repository" echo " * https://github.com/GameServerManagers/LinuxGSM/wiki/jq" fi - if [ -n "${jquniversemissing}" ]; then - fn_install_universe_repo - fi sudo -v > /dev/null 2>&1 if [ $? -eq 0 ]; then fn_print_information_nl "Automatically installing missing dependencies." @@ -298,6 +256,11 @@ fn_found_missing_deps(){ if [ "${function_selfname}" == "command_install.sh" ]; then sleep 5 fi + else + if [ "${function_selfname}" == "command_install.sh" ]; then + fn_print_information_nl "Required dependencies already installed" + fn_script_log_info "Required dependencies already installed" + fi fi } @@ -396,6 +359,9 @@ fn_deps_build_debian(){ # Serious Sam 3: BFE elif [ "${shortname}" == "ss3" ]; then array_deps_required+=( libxrandr2:i386 libglu1-mesa:i386 libxtst6:i386 libusb-1.0-0-dev:i386 libxxf86vm1:i386 libopenal1:i386 libssl1.0.0:i386 libgtk2.0-0:i386 libdbus-glib-1-2:i386 libnm-glib-dev:i386 ) + # Sven Co-op + elif [ "${shortname}" == "sven" ]; then + array_deps_required+=( libssl1.0.0:i386 ) # Unreal Engine elif [ "${executable}" == "./ucc-bin" ]; then #UT2K4 @@ -411,6 +377,9 @@ fn_deps_build_debian(){ # Eco elif [ "${shortname}" == "eco" ]; then array_deps_required+=( mono-complete ) + # Wurm: Unlimited + elif [ "${shortname}" == "wurm" ]; then + array_deps_required+=( xvfb ) fi fn_deps_email fn_check_loop @@ -523,9 +492,18 @@ fn_deps_build_redhat(){ } if [ "${function_selfname}" == "command_install.sh" ]; then - echo "" - echo "Checking Dependencies" - echo "=================================" + if [ "$(whoami)" == "root" ]; then + echo "" + echo "Checking Dependencies as root" + echo "=================================" + fn_print_information_nl "Checking any missing dependencies for ${gamename} server only." + fn_print_information_nl "This will NOT install a ${gamename} server." + sleep 2 + else + echo "" + echo "Checking Dependencies" + echo "=================================" + fi fi # Filter checking in to Debian or Red Hat Based