From acdf2591d613d6391ec074b4c232291ec7f9b6da Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Mon, 19 Feb 2024 16:11:35 -0500 Subject: [PATCH] Moved source helper_install.sh out of helper_functions.sh --- scripts/helper_functions.sh | 4 ---- scripts/helper_install.sh | 3 +++ scripts/start.sh | 4 ++++ scripts/update.sh | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/helper_functions.sh b/scripts/helper_functions.sh index 8c35b03da..efeb5c34b 100644 --- a/scripts/helper_functions.sh +++ b/scripts/helper_functions.sh @@ -241,7 +241,3 @@ countdown_message() { fi return "$return_val" } - -# Helper Functions for installation & updates -# shellcheck source=/dev/null -source "/home/steam/server/helper_install.sh" diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index 268ed4180..985fe6549 100644 --- a/scripts/helper_install.sh +++ b/scripts/helper_install.sh @@ -1,6 +1,9 @@ #!/bin/bash # This file contains functions which can be used in multiple scripts +# shellcheck source=/dev/null +source "/home/steam/server/helper_functions.sh" + # Returns 0 if game is installed # Returns 1 if game is not installed IsInstalled() { diff --git a/scripts/start.sh b/scripts/start.sh index a2908dd83..3e8d7f980 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -2,6 +2,10 @@ # shellcheck source=/dev/null source "/home/steam/server/helper_functions.sh" +# Helper Functions for installation & updates +# shellcheck source=/dev/null +source "/home/steam/server/helper_install.sh" + dirExists "/palworld" || exit isWritable "/palworld" || exit isExecutable "/palworld" || exit diff --git a/scripts/update.sh b/scripts/update.sh index ec86e79b8..2a2e4650c 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -2,6 +2,10 @@ # shellcheck source=/dev/null source "/home/steam/server/helper_functions.sh" +# Helper Functions for installation & updates +# shellcheck source=/dev/null +source "/home/steam/server/helper_install.sh" + # Check if Update was actually required if UpdateRequired; then if [ "${UPDATE_ON_BOOT}" = false ]; then