From 6b251cc473c0e19730a30f35284aba16fd045c56 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 14 Oct 2019 23:30:15 +0100 Subject: [PATCH 1/2] fix(install): pstbs and wurm dependency fix --- lgsm/functions/check_deps.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 8cf1a3de4..574f888e9 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -436,6 +436,8 @@ fn_deps_build_debian(){ # Wurm: Unlimited elif [ "${shortname}" == "wurm" ]; then array_deps_required+=( xvfb ) + elif [ "${shortname}" == "pstbs" ]; then + array_deps_required+=( libgconf-2-4 ) fi fn_deps_email fn_check_loop @@ -521,7 +523,7 @@ fn_deps_build_redhat(){ else array_deps_required+=( java-1.8.0-openjdk rng-tools ) fi - # Project Zomboid & Minecraft + # Minecraft elif [ "${shortname}" == "pz" ]; then javaversion=$(java -version 2>&1 | grep "version") if [ "${javaversion}" ]; then @@ -552,6 +554,10 @@ fn_deps_build_redhat(){ # Unturned elif [ "${shortname}" == "unt" ]; then array_deps_required+=( mono-complete ) + elif [ "${shortname}" == "wurm" ]; then + array_deps_required+=( xorg-x11-server-Xvfb ) + elif [ "${shortname}" == "pstbs" ]; then + array_deps_required+=( GConf2 ) fi fn_deps_email fn_check_loop From 3d9f365f7b7e9abd991a1484238a5a262165f337 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Mon, 14 Oct 2019 23:37:15 +0100 Subject: [PATCH 2/2] feat(install): add tar to dependency checking --- lgsm/functions/check_deps.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lgsm/functions/check_deps.sh b/lgsm/functions/check_deps.sh index 574f888e9..c70c86266 100644 --- a/lgsm/functions/check_deps.sh +++ b/lgsm/functions/check_deps.sh @@ -335,7 +335,7 @@ fn_deps_build_debian(){ array_deps_missing=() # LinuxGSM requirements. - array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 bzip2 gzip unzip binutils bc jq ) + array_deps_required=( curl wget ca-certificates file bsdmainutils util-linux python3 tar bzip2 gzip unzip binutils bc jq ) # All servers except ts3 require tmux. if [ "${shortname}" != "ts3" ]; then @@ -450,17 +450,17 @@ fn_deps_build_redhat(){ # LinuxGSM requirements. # CentOS if [ "${distroversion}" == "6" ]; then - array_deps_required=( epel-release curl wget util-linux-ng python file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( epel-release curl wget util-linux-ng python file tar gzip bzip2 unzip binutils bc jq ) elif [ "${distroversion}" == "7" ]; then - array_deps_required=( epel-release curl wget util-linux python3 file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( epel-release curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq ) elif [ "${distroversion}" == "8" ]; then - array_deps_required=( epel-release curl wget util-linux python36 file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( epel-release curl wget util-linux python36 file tar gzip bzip2 unzip binutils bc jq ) elif [ "${distroid}" == "fedora" ]; then - array_deps_required=( curl wget util-linux python3 file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq ) elif [[ "${distroname}" == *"Amazon Linux AMI"* ]]; then - array_deps_required=( curl wget util-linux python3 file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq ) else - array_deps_required=( curl wget util-linux python3 file gzip bzip2 unzip binutils bc jq ) + array_deps_required=( curl wget util-linux python3 file tar gzip bzip2 unzip binutils bc jq ) fi # All servers except ts3 require tmux.