Game_Servers/General
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evaluation of saved installer var

Browse Source
This commit is contained in:
Price Hiller 2021-12-26 00:04:33 -06:00
parent 416c6aaf78
commit 744e57dfa1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Scripts/install-requirements.bash
View File

@ -24,7 +24,7 @@ install_method_centos() {
fi fi
echo "Installing epel-release, NOT fully configured..., see: https://docs.fedoraproject.org/en-US/epel/" echo "Installing epel-release, NOT fully configured..., see: https://docs.fedoraproject.org/en-US/epel/"
sleep 3 sleep 3
"${INSTALLER}" epel-release $("${INSTALLER} epel-release") 2>/dev/null
} }
install_method_ubuntu() { install_method_ubuntu() {
@ -55,9 +55,9 @@ main() {
OS_RELEASE="$(grep ^NAME= /etc/os-release | cut -d "=" -f2 | tr -d '"')" OS_RELEASE="$(grep ^NAME= /etc/os-release | cut -d "=" -f2 | tr -d '"')"
if [[ "${OS_RELEASE}" = *"CentOS"* ]]; then if [[ "${OS_RELEASE}" = *"CentOS"* ]]; then
install_method_centos || exit install_method_centos
elif [[ "${OS_RELEASE}" = *"Ubuntu"* ]]; then elif [[ "${OS_RELEASE}" = *"Ubuntu"* ]]; then
install_method_ubuntu || exit install_method_ubuntu
else else
echo "${OS_RELEASE} is not a supported distribution, attempt a manual installation." echo "${OS_RELEASE} is not a supported distribution, attempt a manual installation."
exit 1 exit 1
@ -70,7 +70,7 @@ main() {
for pkg in "${INSTALL_PACKAGES[@]}"; do for pkg in "${INSTALL_PACKAGES[@]}"; do
echo "Installing ${pkg}" echo "Installing ${pkg}"
"${INSTALLER}" "${pkg}" "$(${INSTALLER} "${pkg}")"
done done
echo "Finished installing general module items" echo "Finished installing general module items"