From 59f25f1ddb029ac150658ab99fc865170e6853c2 Mon Sep 17 00:00:00 2001 From: PartyWumpus <48649272+PartyWumpus@users.noreply.github.com> Date: Wed, 14 Aug 2024 23:34:42 +0100 Subject: [PATCH] env bash instead of "hardcoded" /bin/bash --- defaults/scripts/Extensions/Epic/epic-launcher.sh | 4 ++-- defaults/scripts/Extensions/Epic/get-epic-args.sh | 2 +- defaults/scripts/Extensions/Epic/install_deps.sh | 2 +- defaults/scripts/Extensions/Epic/login.sh | 2 +- defaults/scripts/Extensions/Epic/settings.sh | 2 +- defaults/scripts/Extensions/Epic/store.sh | 2 +- defaults/scripts/install_deps.sh | 2 +- defaults/scripts/junk-store.sh | 2 +- defaults/scripts/settings.sh | 2 +- defaults/scripts/shared.sh | 2 +- defaults/scripts/shared/GameSet.py | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/defaults/scripts/Extensions/Epic/epic-launcher.sh b/defaults/scripts/Extensions/Epic/epic-launcher.sh index 0e66f91..4a46279 100755 --- a/defaults/scripts/Extensions/Epic/epic-launcher.sh +++ b/defaults/scripts/Extensions/Epic/epic-launcher.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # These need to be exported because it does not get executed in the context of the plugin. export DECKY_PLUGIN_RUNTIME_DIR="${HOME}/homebrew/data/Junk-Store" export DECKY_PLUGIN_DIR="${HOME}/homebrew/plugins/Junk-Store" @@ -174,7 +174,7 @@ eval "`echo -e $QUOTED_ARGS`" &>> "${DECKY_PLUGIN_LOG_DIR}/${ID}.log" sync-saves -# echo "#!/bin/bash" > run.sh +# echo "#!/usr/bin/env bash" > run.sh # echo "${CMD} ${ARGS}" >> run.sh # chmod +x run.sh # ./run.sh && rm run.sh diff --git a/defaults/scripts/Extensions/Epic/get-epic-args.sh b/defaults/scripts/Extensions/Epic/get-epic-args.sh index 1cec438..2bdb900 100755 --- a/defaults/scripts/Extensions/Epic/get-epic-args.sh +++ b/defaults/scripts/Extensions/Epic/get-epic-args.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash PLATFORM=Epic export DECKY_PLUGIN_RUNTIME_DIR="${HOME}/homebrew/data/Junk-Store" export DECKY_PLUGIN_DIR="${HOME}/homebrew/plugins/Junk-Store" diff --git a/defaults/scripts/Extensions/Epic/install_deps.sh b/defaults/scripts/Extensions/Epic/install_deps.sh index f22b440..97e152a 100755 --- a/defaults/scripts/Extensions/Epic/install_deps.sh +++ b/defaults/scripts/Extensions/Epic/install_deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash DOWNLOAD_LOCATION=https://github.com/ebenbruyns/legendary-flatpak/releases/latest/download/legendary.flatpak function uninstall() { echo "Uninstalling flatpaks" diff --git a/defaults/scripts/Extensions/Epic/login.sh b/defaults/scripts/Extensions/Epic/login.sh index 5c73f7d..c5d0dd3 100755 --- a/defaults/scripts/Extensions/Epic/login.sh +++ b/defaults/scripts/Extensions/Epic/login.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # These need to be exported because it does not get executed in the context of the plugin. export DECKY_PLUGIN_RUNTIME_DIR="${HOME}/homebrew/data/Junk-Store" export DECKY_PLUGIN_DIR="${HOME}/homebrew/plugins/Junk-Store" diff --git a/defaults/scripts/Extensions/Epic/settings.sh b/defaults/scripts/Extensions/Epic/settings.sh index 026b812..662f34b 100644 --- a/defaults/scripts/Extensions/Epic/settings.sh +++ b/defaults/scripts/Extensions/Epic/settings.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash EPICCONF="${DECKY_PLUGIN_DIR}/scripts/epic-config.py" export LEGENDARY="/bin/flatpak run com.github.derrod.legendary" PROTON_TRICKS="/bin/flatpak run com.github.Matoking.protontricks" diff --git a/defaults/scripts/Extensions/Epic/store.sh b/defaults/scripts/Extensions/Epic/store.sh index 3bd3e9d..a9959ff 100644 --- a/defaults/scripts/Extensions/Epic/store.sh +++ b/defaults/scripts/Extensions/Epic/store.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Register actions with the junk-store.sh script ACTIONS+=("install-overlay" "update-overlay" "remove-overlay" "registry-fix" "update-umu-id") diff --git a/defaults/scripts/install_deps.sh b/defaults/scripts/install_deps.sh index b34bbba..69b5593 100755 --- a/defaults/scripts/install_deps.sh +++ b/defaults/scripts/install_deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function install(){ echo "===================================" echo " Dependecy installation starting" diff --git a/defaults/scripts/junk-store.sh b/defaults/scripts/junk-store.sh index e7added..ef9fa7e 100755 --- a/defaults/scripts/junk-store.sh +++ b/defaults/scripts/junk-store.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash source "./scripts/settings.sh" mkdir "${DECKY_PLUGIN_RUNTIME_DIR}/scripts/Extensions" -p source "${DECKY_PLUGIN_DIR}/scripts/shared.sh" diff --git a/defaults/scripts/settings.sh b/defaults/scripts/settings.sh index 197f8b5..6cb63f9 100755 --- a/defaults/scripts/settings.sh +++ b/defaults/scripts/settings.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash if [[ -z "${DECKY_PLUGIN_DIR}" ]]; then export DECKY_PLUGIN_DIR="${HOME}/homebrew/plugins/Junk-Store" diff --git a/defaults/scripts/shared.sh b/defaults/scripts/shared.sh index fd69fcd..278f7d4 100755 --- a/defaults/scripts/shared.sh +++ b/defaults/scripts/shared.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash function init() { for platform in "${PLATFORMS[@]}"; do diff --git a/defaults/scripts/shared/GameSet.py b/defaults/scripts/shared/GameSet.py index f9945a6..04dd872 100755 --- a/defaults/scripts/shared/GameSet.py +++ b/defaults/scripts/shared/GameSet.py @@ -393,7 +393,7 @@ def generate_env_settings_json(self, json_file): return self.generate_bash_env_settings(content) def generate_bash_env_settings(self, config_json): - script = "#!/bin/bash\n" + script = "#!/usr/bin/env bash\n" config = json.loads(config_json) sections = config['Sections'] for section in sections: