Updated ipfs for nvda tools.
This commit is contained in:
@@ -151,7 +151,7 @@ EOF
|
|||||||
|
|
||||||
# Setup nvda2speechd for accessibility
|
# Setup nvda2speechd for accessibility
|
||||||
echo "# Setting up accessibility support..."
|
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
|
if [[ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd" ]]; then
|
||||||
cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd"
|
cp "${cache}/nvda2speechd" "${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd"
|
||||||
chmod +x "${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() {
|
update_nvda_dlls() {
|
||||||
# Ensure we have the replacement DLLs
|
# Ensure we have the replacement DLLs
|
||||||
source .includes/functions.sh
|
source .includes/functions.sh
|
||||||
download "https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd32.dll" \
|
download "${nvdaControllerClientDll}" "${nvdaControllerClient64Dll}"
|
||||||
"https://github.com/RastislavKish/nvda2speechd/releases/download/v0.1/nvda2speechd64.dll"
|
|
||||||
|
|
||||||
# Update wine64 bottle (most common)
|
# Update wine64 bottle (most common)
|
||||||
if [[ -d "$HOME/.local/wine64" ]]; then
|
if [[ -d "$HOME/.local/wine64" ]]; then
|
||||||
@@ -450,23 +449,23 @@ update_nvda_dlls() {
|
|||||||
|
|
||||||
case "${basename,,}" in
|
case "${basename,,}" in
|
||||||
"nvdacontrollerclient32.dll")
|
"nvdacontrollerclient32.dll")
|
||||||
replacement="${cache}/nvda2speechd32.dll"
|
replacement="${cache}/nvdaControllerClient32.dll"
|
||||||
;;
|
;;
|
||||||
"nvdacontrollerclient64.dll")
|
"nvdacontrollerclient64.dll")
|
||||||
replacement="${cache}/nvda2speechd64.dll"
|
replacement="${cache}/nvdaControllerClient64.dll"
|
||||||
;;
|
;;
|
||||||
"nvdacontrollerclient.dll")
|
"nvdacontrollerclient.dll")
|
||||||
# Use file command to detect architecture
|
# Use file command to detect architecture
|
||||||
if file "$dllFile" | grep -q "PE32+"; then
|
if file "$dllFile" | grep -q "PE32+"; then
|
||||||
replacement="${cache}/nvda2speechd64.dll"
|
replacement="${cache}/nvdaControllerClient64.dll"
|
||||||
elif file "$dllFile" | grep -q "PE32"; then
|
elif file "$dllFile" | grep -q "PE32"; then
|
||||||
replacement="${cache}/nvda2speechd32.dll"
|
replacement="${cache}/nvdaControllerClient32.dll"
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if [[ -n "$replacement" ]] && [[ -f "$replacement" ]]; then
|
if [[ -n "$replacement" ]] && [[ -f "$replacement" ]]; then
|
||||||
echo "Updating $dllFile with nvda2speechd"
|
echo "Updating $dllFile with nvdaControllerClient"
|
||||||
cp "$replacement" "$dllFile"
|
cp "$replacement" "$dllFile"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
@@ -475,8 +474,8 @@ update_nvda_dlls() {
|
|||||||
# Also update wine32 bottle if it exists
|
# Also update wine32 bottle if it exists
|
||||||
if [[ -d "$HOME/.local/wine32" ]]; then
|
if [[ -d "$HOME/.local/wine32" ]]; then
|
||||||
find "$HOME/.local/wine32" -type f \( -iname "nvdaControllerClient*.dll" \) -print0 | while IFS= read -r -d '' dllFile; do
|
find "$HOME/.local/wine32" -type f \( -iname "nvdaControllerClient*.dll" \) -print0 | while IFS= read -r -d '' dllFile; do
|
||||||
echo "Updating $dllFile with nvda2speechd32"
|
echo "Updating $dllFile with nvdaControllerClient32"
|
||||||
cp "${cache}/nvda2speechd32.dll" "$dllFile"
|
cp "${cache}/nvdaControllerClient32.dll" "$dllFile"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -489,11 +488,7 @@ game_launcher() {
|
|||||||
|
|
||||||
# Start nvda2speechd if available
|
# Start nvda2speechd if available
|
||||||
if [[ -x ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd ]]; then
|
if [[ -x ${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd ]]; then
|
||||||
if command -v FEXLoader &> /dev/null ; then
|
${XDG_DATA_HOME:-$HOME/.local/share}/audiogame-manager/nvda2speechd &> /dev/null &
|
||||||
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
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Replace NVDA controller client DLLs in wine64 bottle
|
# Replace NVDA controller client DLLs in wine64 bottle
|
||||||
@@ -621,7 +616,9 @@ unset manualInstall
|
|||||||
unset version
|
unset version
|
||||||
# ipfs gateway
|
# ipfs gateway
|
||||||
export ipfsGateway="${ipfsGateway:-https://ipfs.stormux.org}"
|
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()
|
# nvda2speechd server startup is now handled in game_launcher()
|
||||||
|
|
||||||
|
@@ -49,11 +49,11 @@ export WINEPREFIX="$HOME/.local/wine/conjury"
|
|||||||
|
|
||||||
# Make sure both nvda2speechd 64 and 32 bit are available.
|
# 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.
|
# 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.
|
# Now it should be as simple as running get_steam to redownload the game.
|
||||||
get_steam 2684520 "https://store.steampowered.com/app/2684520/Conjury/"
|
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_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/nvda2speechd32.dll" "{}" \;
|
find "$WINEPREFIX/drive_c/Program Files/Conjury" -type f -path '*/x86/nvdaControllerClient.dll' -exec cp -v "$cache/nvdaControllerClient32.dll" "{}" \;
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
@@ -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; }
|
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"
|
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 '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"
|
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 -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
|
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
|
||||||
|
Reference in New Issue
Block a user