From afc1ccac971c70f6b39da4e5f1f99e293833cccf Mon Sep 17 00:00:00 2001 From: "Carlos M. Martinez" Date: Mon, 19 Feb 2024 19:29:18 -0500 Subject: [PATCH] Moved source includes --- 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 41921f1c7..1d73e6392 100644 --- a/scripts/helper_functions.sh +++ b/scripts/helper_functions.sh @@ -133,7 +133,3 @@ RCON() { local args="$1" rcon-cli -c /home/steam/server/rcon.yaml "$args" } - -# Helper Functions for installation & updates -# shellcheck source=/dev/null -source "/home/steam/server/helper_install.sh" \ No newline at end of file diff --git a/scripts/helper_install.sh b/scripts/helper_install.sh index a75c923e1..3b9743a23 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 e15b47b0f..f9827d06d 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 5489bf5c9..338dbd94a 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" + UpdateRequired updateRequired=$? # Check if Update was actually required