diff --git a/audiogame-manager.sh b/audiogame-manager.sh index 1e6958b..2f471ef 100755 --- a/audiogame-manager.sh +++ b/audiogame-manager.sh @@ -151,7 +151,7 @@ EOF # Setup nvda2speechd for accessibility echo "# Setting up accessibility support..." - download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd" + download "${nvda2speechdBinary}" if [[ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" ]]; then cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" chmod +x "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" @@ -439,8 +439,7 @@ create_game_array() { update_nvda_dlls() { # Ensure we have the replacement DLLs source .includes/functions.sh - download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" \ - "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" + download "${nvdaControllerClientDll}" "${nvdaControllerClient64Dll}" # Update wine64 bottle (most common) if [[ -d "$HOME/.local/wine64" ]]; then @@ -450,23 +449,23 @@ update_nvda_dlls() { case "${basename,,}" in "nvdacontrollerclient32.dll") - replacement="${cache}/nvda2speechd32.dll" + replacement="${cache}/nvdaControllerClient32.dll" ;; "nvdacontrollerclient64.dll") - replacement="${cache}/nvda2speechd64.dll" + replacement="${cache}/nvdaControllerClient64.dll" ;; "nvdacontrollerclient.dll") # Use file command to detect architecture if file "$dllFile" | grep -q "PE32+"; then - replacement="${cache}/nvda2speechd64.dll" + replacement="${cache}/nvdaControllerClient64.dll" elif file "$dllFile" | grep -q "PE32"; then - replacement="${cache}/nvda2speechd32.dll" + replacement="${cache}/nvdaControllerClient32.dll" fi ;; esac if [[ -n "$replacement" ]] && [[ -f "$replacement" ]]; then - echo "Updating $dllFile with nvda2speechd" + echo "Updating $dllFile with nvdaControllerClient" cp "$replacement" "$dllFile" fi done @@ -475,8 +474,8 @@ update_nvda_dlls() { # Also update wine32 bottle if it exists if [[ -d "$HOME/.local/wine32" ]]; then find "$HOME/.local/wine32" -type f \( -iname "nvdaControllerClient*.dll" \) -print0 | while IFS= read -r -d '' dllFile; do - echo "Updating $dllFile with nvda2speechd32" - cp "${cache}/nvda2speechd32.dll" "$dllFile" + echo "Updating $dllFile with nvdaControllerClient32" + cp "${cache}/nvdaControllerClient32.dll" "$dllFile" done fi } @@ -489,11 +488,7 @@ game_launcher() { # Start nvda2speechd if available if [[ -x ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd ]]; then - if command -v FEXLoader &> /dev/null ; then - FEXLoader -- ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &> /dev/null & - else - ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &> /dev/null & - fi + ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &> /dev/null & fi # Replace NVDA controller client DLLs in wine64 bottle @@ -621,7 +616,9 @@ unset manualInstall unset version # ipfs gateway export ipfsGateway="${ipfsGateway:-https://ipfs.stormux.org}" -export nvdaControllerClientDll="${ipfsGateway}/ipfs/QmWu7YdSbKMk1Qm5DKvEA5hk1YuAK8wVkwhDf2CsmPkmF1?filename=nvdaControllerClient32.dll" +export nvdaControllerClientDll="${ipfsGateway}/ipfs/Qmd1JXdDoKJVnoaQssDiBgRpbgwKUwdJigiPw8iiYro3vt?filename=nvdaControllerClient32.dll" +export nvdaControllerClient64Dll="${ipfsGateway}/ipfs/QmcPoBTm6eCFF4R4uUc1of3rtrqMVx3HFN1U1jHosay8EX?filename=nvdaControllerClient64.dll" +export nvda2speechdBinary="${ipfsGateway}/ipfs/QmPxhoNsoFoJC7bCfioBBCcK8tEoSoYpm342z6u7KjFsVz?filename=nvda2speechd" # nvda2speechd server startup is now handled in game_launcher() diff --git a/game-scripts/conjury-update.sh b/game-scripts/conjury-update.sh index 41a4e49..8592899 100755 --- a/game-scripts/conjury-update.sh +++ b/game-scripts/conjury-update.sh @@ -49,11 +49,11 @@ export WINEPREFIX="$HOME/.local/wine/conjury" # Make sure both nvda2speechd 64 and 32 bit are available. # This is needed to work around the change from 64 bit to 32 bit game. -download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll" "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" +download "${nvdaControllerClient64Dll}" "${nvdaControllerClientDll}" # Now it should be as simple as running get_steam to redownload the game. get_steam 2684520 "https://store.steampowered.com/app/2684520/Conjury/" -find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86_64/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd64.dll" "{}" \; -find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvda2speechd32.dll" "{}" \; +find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86_64/nvdaControllerClient.dll' -exec cp -v "$cache/nvdaControllerClient64.dll" "{}" \; +find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvdaControllerClient32.dll" "{}" \; exit 0 diff --git a/game-scripts/crazy-party-update.sh b/game-scripts/crazy-party-update.sh index 8aa6bc2..a315068 100755 --- a/game-scripts/crazy-party-update.sh +++ b/game-scripts/crazy-party-update.sh @@ -68,7 +68,7 @@ url="http://pragmapragma.free.fr/crazy-party/Crazy-Party-beta${newVersion}.zip" wget -O "${cache}/Crazy-Party-beta${newVersion}.zip" "$url" || { echo "Could not download file."; exit 1; } unzip -DDod "${WINEPREFIX}/drive_c/Program Files" "${cache}/Crazy-Party-beta${newVersion}.zip" find "${WINEPREFIX}" -type f -name 'Tolk.dll' -exec cp -v "${cache}/Tolk.dll" "{}" \; -find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvda2speechd64.dll" "{}" \; +find "${WINEPREFIX}" -type f -name 'nvdaControllerClient64.dll' -exec cp -v "${cache}/nvdaControllerClient64.dll" "{}" \; sed -i "s/Crazy-Party-beta${oldVersion}/Crazy-Party-beta${newVersion}/" "$configFile" cp -v "${WINEPREFIX}/drive_c/Program Files/Crazy-Party-beta${oldVersion}/save.bin" "$HOME/.local/wine/crazy-party/drive_c/Program Files/Crazy-Party-beta${newVersion}/" cp -ruv "${WINEPREFIX}/drive_c/Program Files/Crazy-Party-beta${oldVersion}/"* "$HOME/.local/wine/crazy-party/drive_c/Program Files/Crazy-Party-beta${newVersion}/" 2> /dev/null