From 0c5fdaae4226279df796e4fad551f0a73737f8a5 Mon Sep 17 00:00:00 2001 From: Boria138 Date: Fri, 6 Oct 2023 12:45:42 +0600 Subject: [PATCH] Update and fixes autoinstalls --- .../scripts/pw_autoinstall/PW_ANKAMA | 2 +- .../scripts/pw_autoinstall/PW_BETHESDA | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_BSR | 2 +- .../scripts/pw_autoinstall/PW_CALIBER | 14 +------------- data_from_portwine/scripts/pw_autoinstall/PW_CWC | 1 - .../scripts/pw_autoinstall/PW_DOLPHIN | 2 +- .../scripts/pw_autoinstall/PW_DUCKSTATION | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_EAAPP | 3 +-- data_from_portwine/scripts/pw_autoinstall/PW_EPIC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_EPSXE | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_EVE | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_FCEUX | 2 +- .../scripts/pw_autoinstall/PW_GAMEFORGE | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_GLYPH | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GOG | 5 ++--- .../scripts/pw_autoinstall/PW_IGCLIENT | 1 - data_from_portwine/scripts/pw_autoinstall/PW_ITCH | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_LGC | 11 ++--------- data_from_portwine/scripts/pw_autoinstall/PW_LOL | 9 +++++++-- data_from_portwine/scripts/pw_autoinstall/PW_MAME | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_MWO | 1 - .../scripts/pw_autoinstall/PW_ORIGIN | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_OSU | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_POE | 1 - .../scripts/pw_autoinstall/PW_PPSSPP | 2 +- .../scripts/pw_autoinstall/PW_PROJECT64 | 2 +- .../scripts/pw_autoinstall/PW_RETROARCH | 2 +- .../scripts/pw_autoinstall/PW_ROBLOX | 4 ++-- .../scripts/pw_autoinstall/PW_ROCKSTAR | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 | 4 ++-- .../scripts/pw_autoinstall/PW_SCUMMVM | 9 ++------- data_from_portwine/scripts/pw_autoinstall/PW_SO | 1 - .../scripts/pw_autoinstall/PW_STALCRAFT | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_STEAM | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_SWL | 1 - data_from_portwine/scripts/pw_autoinstall/PW_UBC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_VBA-M | 4 ++-- .../scripts/pw_autoinstall/PW_VKPLAY | 6 +++--- data_from_portwine/scripts/pw_autoinstall/PW_WGC | 11 +---------- data_from_portwine/scripts/pw_autoinstall/PW_WOSB | 2 +- .../scripts/pw_autoinstall/PW_YABAUSE | 2 +- 41 files changed, 52 insertions(+), 88 deletions(-) diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index 3f1ddb95..ea31c45d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Ankama-Setup.exe" start_portwine -if try_download "download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" +if try_download "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Ankama Launcher. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA index bdc1470d..c75f07e2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/BethesdaNetLauncher_Setup.exe" start_portwine -if try_download "download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} BethesdaNetLauncher. ${loc_gui_please_wait} " pw_kill_autostart BethesdaNetLauncher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BSR b/data_from_portwine/scripts/pw_autoinstall/PW_BSR index 24fe72fb..7f78e5ac 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BSR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BSR @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT /SUPPRESSMSGBOXES") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/bsr_setup.exe" start_portwine -if try_download "battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Battle Of Space Raiders. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER index 39448fd2..82200e68 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -6,19 +6,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CaliberSetup.exe" export PW_WINE_USE=PROTON_STEAM_6.3-8 -if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "github.com/Castro-Fidel/wine_builds/releases/download/${PW_WINE_USE}/${PW_WINE_USE}.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - UNPACK_STATUS=0 - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - fi - fi - [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 -fi +gui_proton_downloader silent "${PW_WINE_USE}" start_portwine if try_download "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CWC b/data_from_portwine/scripts/pw_autoinstall/PW_CWC index f5a2840f..bae0986b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CWC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CWC @@ -1,7 +1,6 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="CONTRACT_WARS" export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CWClient_Install.exe" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN index 9b2ef6f1..290849b7 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/dolphin-x64-5.0.exe" start_portwine -if try_download "dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Dolphin 5.0. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION index 1490e76b..a2fdb81f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DUCKSTATION @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/duckstation-windows-x64-release.zip" start_portwine -if try_download "github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Duckstation" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index f3b1e9fe..5277aad2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -3,7 +3,6 @@ ######################################################################## export LAUNCH_PARAMETERS=("/silent" "/repair" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" -export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 export PW_PREFIX_NAME="EA_APP" # export DISABLE_CP_DEFPFX=1 @@ -11,7 +10,7 @@ export PW_PREFIX_NAME="EA_APP" # gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" start_portwine -if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " pw_kill_autostart EABackgroundService.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 2c1236b8..1cb8aa09 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -8,7 +8,7 @@ export PW_USE_D3D_EXTRAS=1 try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" start_portwine -if try_download "launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" +if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing Epic Games Launcher. ${loc_gui_please_wait} " # try_remove_dir "${WINEPREFIX}/drive_c/Program Files (x86)/Epic Games/Epic Online Services/" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE index 3ec32c29..788dca7e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPSXE @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/ePSXe205.zip" start_portwine -if try_download "www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/EPSXe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EVE b/data_from_portwine/scripts/pw_autoinstall/PW_EVE index b5165e06..e88b8625 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -5,7 +5,7 @@ export PW_WINDOWS_VER=10 export PW_DLL_INSTALL="vcrun2017" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-2198233.exe" start_portwine -if try_download "binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" then pw_kill_autostart evelauncher.exe & pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX index 56aa7b24..61363e8c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.5-win64.zip" start_portwine -if try_download "https://github.com/TASEmulators/fceux/releases/download/v2.6.5/fceux-2.6.5-win64.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-win64.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} FCEUX. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/FCEUX" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE index ecb94cb7..6cc0f734 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE @@ -22,7 +22,7 @@ pw_shutdown_please () { export LAUNCH_PARAMETERS=("") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GameforgeInstaller.exe" start_portwine -if try_download "raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Gameforge-Client. ${loc_gui_please_wait} " pw_shutdown_please SparkWebHelper.exe & @@ -35,4 +35,4 @@ then export PORTWINE_CREATE_SHORTCUT_NAME="GameforgeClient" portwine_create_shortcut fi -stop_portwine \ No newline at end of file +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH index aae86791..0e33b1a4 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/GlyphInstall.exe" start_portwine -if try_download "download.dyn.triongames.com/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} GlyphClient. ${loc_gui_please_wait} " pw_kill_autostart GlyphClient.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index 4b0c90a8..9de702fd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -2,10 +2,9 @@ # Author: Castro-Fidel (linux-gaming.ru) ######################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") -export GOG_VER=2.0.48.63 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" start_portwine -if try_download "content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://webinstallers.gog-statics.com/download/GOG_Galaxy_2.0.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} GOG Galaxy. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" @@ -16,4 +15,4 @@ then pw_stop_progress_bar portwine_create_shortcut fi -stop_portwine \ No newline at end of file +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT index 0a605ed7..0591d493 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT @@ -2,7 +2,6 @@ # Author: Castro Fidel ######################################################################## export LAUNCH_PARAMETERS=("/S") -export PW_PREFIX_NAME="IGCLIENT" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/igclient_setup.exe" export PW_DLL_INSTALL="vcrun2019" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index 0b77bf11..b4ef4f95 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("--silent") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/itch-setup.exe" start_portwine -if try_download "itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" +if try_download "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} ITCH.IO. ${loc_gui_please_wait} " pw_kill_autostart itch.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LGC b/data_from_portwine/scripts/pw_autoinstall/PW_LGC index 20a61a3f..950ea26f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -5,19 +5,12 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Lesta_Game_Center_Install_RU.exe" export PW_PREFIX_NAME="LGC" export PW_WINE_USE="PROTON_LG_8-4" -try_download_lgc () { - set -o pipefail - wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ - tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 - [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 -} -pw_clear_pfx gui_proton_downloader silent "${PW_WINE_USE}" + start_portwine -if try_download_lgc "redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Starting LGC installation..." pw_kill_autostart lgc.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_LOL b/data_from_portwine/scripts/pw_autoinstall/PW_LOL index ea94e0f7..121ba52b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -13,10 +13,15 @@ export PW_USE_D3D_EXTRAS=1 gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download "lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing League of Legends. ${loc_gui_please_wait} " - zenity --info --width=500 --text "You must click the install button without changing the settings!" + if [ "${update_loc}" = "RUS" ] ; then + zenity --info --width=500 --text "Вы должны нажать кнопку установки, не изменяя настроек!" + fi + if [ "${update_loc}" = "ENG" ] ; then + zenity --info --width=500 --text "You must click the install button without changing the settings!" + fi pw_kill_autostart RiotClientServices.exe & pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Riot Games/Riot Client/RiotClientServices.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MAME b/data_from_portwine/scripts/pw_autoinstall/PW_MAME index b4a69782..be6a81e6 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MAME @@ -1,9 +1,9 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) ######################################################################## -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0237b_64bit.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0259b_64bit.exe" start_portwine -if try_download "github.com/mamedev/mame/releases/download/mame0237/mame0237b_64bit.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} MAME. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Mame" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MWO b/data_from_portwine/scripts/pw_autoinstall/PW_MWO index 8116a069..bf42113c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MWO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MWO @@ -1,7 +1,6 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="METAL_WAR_ONLINE" export LAUNCH_PARAMETERS=("/s" "/nr" "/l=Russian") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MWO_Launcher_Setup.exe" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index 8a73e44c..08fbfc5e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/silent" "/NoLaunch" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe" start_portwine -if try_download "origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Origin. ${loc_gui_please_wait}" # pw_kill_autostart Origin.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU index 34508452..1132e00d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -3,10 +3,10 @@ ######################################################################## export PW_PREFIX_NAME=DOTNET start_portwine -export PW_DLL_INSTALL="dotnet48" +#export PW_DLL_INSTALL="dotnet48" mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" -if try_download "m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} OSU!. ${loc_gui_please_wait} " if [ -f "${PORT_WINE_PATH}/data/pfx_dotnet/drive_c/Program Files (x86)/OSU/osu!install.exe" ]; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_POE b/data_from_portwine/scripts/pw_autoinstall/PW_POE index 4f98ae24..7d1b8c04 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_POE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_POE @@ -3,7 +3,6 @@ ######################################################################## export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PathOfExileInstaller.exe" -export PW_PREFIX_NAME="PATH_OF_EXILE" start_portwine if try_download "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP index 29e16154..17ed6062 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe" start_portwine -if try_download "www.ppsspp.org/files/1_12_3/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} PPSSPPS. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 index 759b566e..4a54843c 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Setup Project64 3.0.1-5664-2df3434.exe" start_portwine -if try_download "www.pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" +if try_download "https://pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Project64. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index 719b2d74..fac2ec77 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/RetroArch.7z" start_portwine -if try_download "buildbot.libretro.com/stable/1.9.13/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" +if try_download "https://buildbot.libretro.com/stable/1.16.0/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} RetroArch. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX index 4feb301d..68ef969d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -3,14 +3,14 @@ ######################################################################## export LAUNCH_PARAMETERS=("") export PW_PREFIX_NAME="ROBLOX" -export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/roblox_installer.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/roblox_installer.exe" export WINEDLLOVERRIDES="mscoree,mshtml=" # export DISABLE_CP_DEFPFX=1 export PW_MUST_HAVE_DLL="" start_portwine -if try_download "setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" then pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$(find "$WINEPREFIX/drive_c/" -type f -name "RobloxPlayerBeta.exe")" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 8ad09385..526cb20e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -4,7 +4,7 @@ export PW_VULKAN_USE="1" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" start_portwine -if try_download "https://dl-eu.opendataapi.net/lutris/games/GTA/rockstar-games-launcher-1-0-36-344.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Rockstar-Games-Launcher. ${loc_gui_please_wait} " try_remove_dir "$WINEPREFIX/drive_c/Program Files/Rockstar Games/Launcher" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 b/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 index c1982c1f..5e46c088 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 @@ -1,9 +1,9 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) ######################################################################## -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/rpcs3-v0.0.27-14790-2de4c03f_win64.7z" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/rpcs3-v0.0.29-15676-9fce7080_win64.7z" start_portwine -if try_download "https://github.com/RPCS3/rpcs3-binaries-win/releases/download/build-2de4c03faa54f001910c1cc5bafda62cc23fa803/rpcs3-v0.0.27-14790-2de4c03f_win64.7z" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/RPCS3/rpcs3-binaries-win/releases/download/build-9fce70809ee06a7e61a3dbe5bb9b0179fc541d9f/rpcs3-v0.0.29-15676-9fce7080_win64.7z" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} RPCS3. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/RPCS3" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM index 275dc586..c1b31c7e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM @@ -2,9 +2,9 @@ # Author: chal55rus (Sergey P.) ########################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/scummvm-2.5.0-win32.exe" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/scummvm-2.7.1-win32.exe" start_portwine -if try_download "downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://downloads.scummvm.org/frs/scummvm/2.7.1/scummvm-2.7.1-win32.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} ScummVM. ${loc_gui_please_wait} " #pw_kill_autostart launcher101xp.exe & @@ -18,8 +18,3 @@ then portwine_create_shortcut fi stop_portwine - - -#/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- - -#downloads.scummvm.org/frs/scummvm/2.5.0/scummvm-2.5.0-win32.exe diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SO b/data_from_portwine/scripts/pw_autoinstall/PW_SO index adc567c5..602da399 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SO @@ -1,7 +1,6 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="STALKER_ONLINE" export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SO_installer.exe" start_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT index 8f7f9617..5a60c64f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT @@ -7,7 +7,7 @@ export PW_PREFIX_NAME=DOTNET start_portwine -if try_download "exbo2.b-cdn.net/EXBO_Setup_ru.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://exbo2.b-cdn.net/EXBO_Setup_ru.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing STALCRAFT Launcher. ${loc_gui_please_wait} " pw_kill_autostart ExboLauncher & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index f25b5c52..d5d981df 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Steam") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SteamSetup.exe" start_portwine -if try_download "cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_cs "${loc_gui_installing_the} Steam. ${loc_gui_please_wait} " pw_kill_autostart steam.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SWL b/data_from_portwine/scripts/pw_autoinstall/PW_SWL index f9c760de..1c15754a 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SWL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SWL @@ -1,7 +1,6 @@ #!/usr/bin/env bash # Author: chal55rus ######################################################################## -export PW_PREFIX_NAME="SWL" export WINEDLLOVERRIDES="d3d9=b" export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SecretWorldLegendsMin.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBC index a15a26af..98ba8024 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_UBC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_UBC @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S" "/D=c:\Program Files (x86)\Ubisoft Game Launcher") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/UbisoftConnectInstaller.exe" start_portwine -if try_download "ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_cs "${loc_gui_installing_the} Ubisoft Connect. ${loc_gui_please_wait} " pw_kill_autostart UbisoftConnect.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M index 2dc40404..b588b496 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -1,9 +1,9 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) ######################################################################## -export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-64bit.zip" +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip" start_portwine -if try_download "github.com/visualboyadvance-m/visualboyadvance-m/releases/download/v2.1.4/visualboyadvance-m-Win-64bit.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} VBA-M. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Visualboyadvance-m" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY index 6bcf92fc..1cba5793 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -7,11 +7,11 @@ export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/dri export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" export PW_WINE_USE="WINE_8.5_LG" -pw_clear_pfx -gui_proton_downloader silent "WINE_8.5_LG" + +gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download "static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" then portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/VKPlayLoader.exe" try_remove_file "${portwine_exe}.ppdb" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 7b6105bc..d91953c8 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -7,19 +7,10 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Wargaming_Game_Center_Install_WoT_${W export PW_PREFIX_NAME="WGC" export PW_WINE_USE="PROTON_LG_8-4" -try_download_wgc () { - set -o pipefail - wget -t 5 -T 3 "$1" --output-document="$2" 2>&1 | \ - tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ - "${pw_yad_v12_3}" --center --progress --percentage=0 --title="Download $(basename $1)" --text=Starting... --auto-close --auto-kill --width=500 --height=90 - [ "${PIPESTATUS[0]}" != 0 ] && print_error "failed to download $1. Scipping." && return 1 || return 0 -} - -pw_clear_pfx gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download_wgc "redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Starting WGC installation..." pw_kill_autostart wgc.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB index 3d970b49..7685088b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -8,7 +8,7 @@ export PW_DLL_INSTALL="faudio dotnet48" export PW_VULKAN_USE=1 start_portwine -if try_download "165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://165311.selcdn.ru/wosb_installer/wos_client.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "Installing World of Sea Battle. ${loc_gui_please_wait} " diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE index 8e34d34c..3371acf9 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/yabause-0.9.15-win64.exe" start_portwine -if try_download "download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Yabause. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}"