Resolved merge conflict.

This commit is contained in:
Storm Dragon 2024-12-21 11:08:36 -05:00
commit 42b40489ce
2 changed files with 9 additions and 2 deletions

5
.install/Soulblaze.sh Normal file
View File

@ -0,0 +1,5 @@
check_architecture x86_64
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"

View File

@ -61,10 +61,10 @@ check_update() {
dialog --backtitle "Linux Game manager" \ dialog --backtitle "Linux Game manager" \
--yesno "Updates are available. Would you like to update now?" -1 -1 --stdout || return --yesno "Updates are available. Would you like to update now?" -1 -1 --stdout || return
# Store the current commit before pulling # Store the current commit before pulling
local before_pull=$(git rev-parse HEAD) local beforePull=$(git rev-parse HEAD)
git pull git pull
# Show changes between the stored commit and current HEAD # 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 $? exit $?
} }
@ -550,6 +550,8 @@ game_launcher() {
else else
exec ${game} exec ${game}
fi fi
else
exec ${game}
fi fi
;; ;;
esac esac