From 6f83974959e94da05337f945c0c155c8fd43e85c Mon Sep 17 00:00:00 2001 From: Zoull Date: Sat, 3 Jun 2023 15:49:33 -0600 Subject: [PATCH] Try and make Humble login scripts generic and test replacement in script --- NonSteamLaunchers.sh | 4 ++-- humble-app/Humble-scheme-handler.desktop | 2 +- humble-app/handle-humble-scheme | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/NonSteamLaunchers.sh b/NonSteamLaunchers.sh index 820d300..d0e4ec2 100644 --- a/NonSteamLaunchers.sh +++ b/NonSteamLaunchers.sh @@ -1845,14 +1845,14 @@ if [[ $options == *"Humble Games Collection"* ]]; then if [[ ! -f "$HOME/.local/share/applications/Humble-scheme-handler.desktop" ]]; then wget https://raw.githubusercontent.com/Zoullx/NonSteamLaunchers-On-Steam-Deck/fix-humble-login/humble-app/Humble-scheme-handler.desktop -O /tmp/Humble-scheme-handler.desktop - cat /tmp/Humble-scheme-handler.desktop | sed "s/{{APPID}}/$appid/" > /tmp/Humble-scheme-handler.desktop + cat /tmp/Humble-scheme-handler.desktop | sed "s/APPID/$appid/" > /tmp/Humble-scheme-handler.desktop desktop-file-install --rebuild-mime-info-cache --dir=$HOME/.local/share/applications /tmp/Humble-scheme-handler.desktop rm -rf /tmp/Humble-scheme-handler.desktop fi if [[ ! -f "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" ]]; then wget https://raw.githubusercontent.com/Zoullx/NonSteamLaunchers-On-Steam-Deck/fix-humble-login/humble-app/handle-humble-scheme -O "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" - cat "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" | sed "s/{{APPID}}/$appid/ > "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" + cat "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" | sed "s/APPID/$appid/ > "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" chmod +x "$HOME/.local/share/Steam/steamapps/compatdata/$appid/pfx/handle-humble-scheme" fi diff --git a/humble-app/Humble-scheme-handler.desktop b/humble-app/Humble-scheme-handler.desktop index ae585af..b05bead 100644 --- a/humble-app/Humble-scheme-handler.desktop +++ b/humble-app/Humble-scheme-handler.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Name=Humble App (Login) Comment=Target for handling Humble App logins. You should not run this manually. -Exec=/home/deck/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/handle-humble-scheme %u +Exec=/home/deck/.local/share/Steam/steamapps/compatdata/APPID/pfx/handle-humble-scheme %u Type=Application MimeType=x-scheme-handler/humble; \ No newline at end of file diff --git a/humble-app/handle-humble-scheme b/humble-app/handle-humble-scheme index b96952d..35331a7 100644 --- a/humble-app/handle-humble-scheme +++ b/humble-app/handle-humble-scheme @@ -3,9 +3,9 @@ set -e export STEAM_COMPAT_CLIENT_INSTALL_PATH=~/.local/share/Steam -export STEAM_COMPAT_DATA_PATH=~/.steam/steam/Steam/steamapps/compatdata/{{APPID}} +export STEAM_COMPAT_DATA_PATH=~/.steam/steam/Steam/steamapps/compatdata/APPID FIXED_SCHEME="$(echo "$1" | sed "s/?/\//")" -echo $FIXED_SCHEME > /home/deck/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/drive_c/.auth +echo $FIXED_SCHEME > /home/deck/.local/share/Steam/steamapps/compatdata/APPID/pfx/drive_c/.auth -~/.steam/steam/steamapps/common/Proton\ -\ Experimental/proton run ~/.local/share/Steam/steamapps/compatdata/{{APPID}}/pfx/start-humble.cmd \ No newline at end of file +~/.steam/steam/steamapps/common/Proton\ -\ Experimental/proton run ~/.local/share/Steam/steamapps/compatdata/APPID/pfx/start-humble.cmd \ No newline at end of file