From 3bb5feedfad49a0a1efb29079dee967e5c0fd9c9 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Sun, 15 Dec 2024 20:37:36 -0500 Subject: [PATCH 1/5] Add support for fex-emu to launch games. New install method tested and doesn't seem to break anything, so merged with master. --- linux-game-manager.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/linux-game-manager.sh b/linux-game-manager.sh index d0f8258..0cf4437 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -71,6 +71,9 @@ check_update() { # Check architecture compatibility check_architecture() { + if command -v FEXLoader &> /dev/null ; then + return + fi local architecture="$(uname -m)" for i in "$@" ; do if [[ "${architecture}" == "$i" ]]; then @@ -541,7 +544,13 @@ game_launcher() { ;; *) pushd "${game%/*}" - exec ${game} + if file "${game##*/}" | grep -q "ELF.*x86-64"; then + if [[ "$(uname -m)" != "x86_64" ]]; then + exec FEXLoader -- ${game} + else + exec ${game} + fi + fi ;; esac exit 0 @@ -621,10 +630,11 @@ while getopts "${args}" i ; do R) redownload="true" ;; r) game_removal ;; t) + gameCount=$(find .install -type f -iname "*.sh" | wc -l) dialog --backtitle "Linux Game Manager" \ - --infobox "There are currently ${#gameList[@]} games available." -1 -1 + --infobox "There are currently ${gameCount} games available." -1 -1 exit 0 - ;; + ;; u) game_update ;; esac done From f1a7a834a12c59ffead66b0a2655e736ebe4a559 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Tue, 17 Dec 2024 17:50:28 -0500 Subject: [PATCH 2/5] Fixed bug where some games were not being launched. --- linux-game-manager.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 0cf4437..9518ab7 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -550,6 +550,8 @@ game_launcher() { else exec ${game} fi + else + exec ${game} fi ;; esac From b67a71b9b77f5ff7449c9f54d025334923620329 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 18 Dec 2024 04:35:46 -0500 Subject: [PATCH 3/5] Game "Soulblaze" added. --- .install/Soulblaze.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .install/Soulblaze.sh diff --git a/.install/Soulblaze.sh b/.install/Soulblaze.sh new file mode 100644 index 0000000..249b8cc --- /dev/null +++ b/.install/Soulblaze.sh @@ -0,0 +1,5 @@ +check_architecture x86_64 +get_installer "soulblaze-win-beta.zip" "https://sword-and-quill.itch.io/soulblaze" +mkdir -p "${installPath}/Soulblaze" +unzip -d "${installPath}/Soulblaze" "${cache}/soulblaze-linux-beta.zip" +add_launcher "${installPath}/Soulblaze/Soulblaze.x86_64" From 7f0c27e472b73969f75d92fc9e68cb0c80fc6a03 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 18 Dec 2024 04:38:11 -0500 Subject: [PATCH 4/5] Updated the file name of the download. Forgot to change it from the Audio Game Manager version. --- .install/Soulblaze.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.install/Soulblaze.sh b/.install/Soulblaze.sh index 249b8cc..7735aec 100644 --- a/.install/Soulblaze.sh +++ b/.install/Soulblaze.sh @@ -1,5 +1,5 @@ check_architecture x86_64 -get_installer "soulblaze-win-beta.zip" "https://sword-and-quill.itch.io/soulblaze" +get_installer "soulblaze-linux-beta.zip" "https://sword-and-quill.itch.io/soulblaze" mkdir -p "${installPath}/Soulblaze" unzip -d "${installPath}/Soulblaze" "${cache}/soulblaze-linux-beta.zip" add_launcher "${installPath}/Soulblaze/Soulblaze.x86_64" From dbf9174f96cc49ab717f4805fcbecfadbd89f2bf Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Wed, 18 Dec 2024 04:45:34 -0500 Subject: [PATCH 5/5] Reorganize the way notes are shown after updates so that they hopefully appear oldest to newest. --- linux-game-manager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 9518ab7..2eacdf2 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -61,10 +61,10 @@ check_update() { dialog --backtitle "Linux Game manager" \ --yesno "Updates are available. Would you like to update now?" -1 -1 --stdout || return # Store the current commit before pulling - local before_pull=$(git rev-parse HEAD) + local beforePull=$(git rev-parse HEAD) git pull # Show changes between the stored commit and current HEAD - git log "$before_pull..HEAD" --pretty=format:'%an: %s' + git log "$beforePull..HEAD" --pretty=format:'%an: %s' | tac exit $? }