From 9e708f0bfa106c69a35efed6e2d5ae54ecd313b3 Mon Sep 17 00:00:00 2001 From: Storm Dragon Date: Thu, 26 Dec 2024 13:22:39 -0500 Subject: [PATCH] Transitional changes for FreeDoom, probably more to come. --- .install/{Freedoom.sh => FreeDoom.sh} | 0 .launch/FreeDoom.game | 4 ++-- linux-game-manager.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename .install/{Freedoom.sh => FreeDoom.sh} (100%) diff --git a/.install/Freedoom.sh b/.install/FreeDoom.sh similarity index 100% rename from .install/Freedoom.sh rename to .install/FreeDoom.sh diff --git a/.launch/FreeDoom.game b/.launch/FreeDoom.game index 9e05f7a..5c0f772 100755 --- a/.launch/FreeDoom.game +++ b/.launch/FreeDoom.game @@ -1,7 +1,7 @@ #!/usr/bin/env bash launch_game() { - pushd "${doomPath}" + pushd "${gamePath}" #echo "exec stdbuf -oL ${gzdoom} ${@} | speak" exec stdbuf -oL ${gzdoom} ${@} | speak popd @@ -340,7 +340,7 @@ case ${buttonCode} in '-extratic' '-dup' '3' ) fi - pushd "${doomPath}" + pushd "${gamePath}" launch_game ${gameOption} "${flags[@]}" ;; 0) diff --git a/linux-game-manager.sh b/linux-game-manager.sh index 94bf902..2c44f3c 100755 --- a/linux-game-manager.sh +++ b/linux-game-manager.sh @@ -430,12 +430,12 @@ game_removal() { gameInstallPath="$(grep -F "installPath" "$gameFile" | grep -v 'pushd' | head -n1)" gameInstallPath="${gameInstallPath#*/}" gameInstallPath="${installPath}/${gameInstallPath%/*}" - if [[ -z "$gameInstallPath" ]] || [[ "${gameInstallPath}" == "$installPath" ]]; then + if [[ -z "$gameInstallPath" ]] || [[ "${gameInstallPath%%/}" == "$installPath" ]]; then # No install path found, just remove from list dialog --backtitle "Linux Game Manager" \ --yesno "This will remove the game from your game list, but will not remove any files. Do you want to continue?" -1 -1 || exit 0 # Remove only the .sh symlink - rm -f "${0%/*}/.launch/${gameName}.sh" | \ + rm -fv "${0%/*}/.launch/${gameName}.sh" | \ dialog --backtitle "Linux Game Manager" \ --progressbox "Removing game from list..." -1 -1 else