From 03f15e67e3ff5d9234af7dc139255faf46802128 Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Mon, 15 Apr 2024 13:11:21 +0300 Subject: [PATCH] Scripts version 2277 --- data_from_portwine/changelog_eng | 4 ++++ data_from_portwine/changelog_rus | 4 ++++ data_from_portwine/scripts/functions_helper | 4 ++-- data_from_portwine/scripts/portwine_db/Caliber | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_BDO | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_BSR | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_CALIBER | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_CEMU | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_CITRA | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_CWC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_DEMUL | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_EAAPP | 4 ++-- 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 | 3 ++- data_from_portwine/scripts/pw_autoinstall/PW_FCEUX | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GLYPH | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GOG | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_ITCH | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_LGC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_LOL | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_MAME | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_MW | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_MWO | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_OSU | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_PANZAR | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_POE | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 | 4 ++-- data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_SO | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_STEAM | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_SWL | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_UBC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_VBA-M | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_WGC | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_WOSB | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_XEMU | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_XENIA | 2 +- data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE | 2 +- data_from_portwine/scripts/var | 2 +- 59 files changed, 73 insertions(+), 64 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 98b0734..c4bdb9a 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,10 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2277### Date: 15.04.2024 / Download update size: 15 megabytes +* HOTFIX for AUTOINSTALL +* HOTFIX - remember choose version of WINE + ###Scripts version 2276### Date: 14.04.2024 / Download update size: 15 megabytes * HOTFIX for SteamDeck diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 828b774..78b3cdb 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2277### Дата: 15.04.2024 / Размер скачиваемого обновления: 15 мегабайт +* HOTFIX - исправлены все автоустановки +* HOTFIX - исправлено сохранение выбранной версии WINE + ###Scripts version 2276### Дата: 14.04.2024 / Размер скачиваемого обновления: 15 мегабайт * HOTFIX - установка и обновление на SteamDeck diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 3045def..a851878 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -124,7 +124,7 @@ try_download () { local silent="false" local no_mirror="false" case "$3" in - silent) + silent) silent=true ;; no_mirror) no_mirror=true @@ -420,7 +420,7 @@ init_wine_ver () { done IFS="$orig_IFS" fi - if ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}" ; then + if [[ -z $(ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}") ]] ; then if [[ "$PW_WINE_USE" =~ PROTON_LG* ]] then export PW_WINE_USE=PROTON_LG else export PW_WINE_USE=WINE_LG diff --git a/data_from_portwine/scripts/portwine_db/Caliber b/data_from_portwine/scripts/portwine_db/Caliber index 579557b..e65ad26 100644 --- a/data_from_portwine/scripts/portwine_db/Caliber +++ b/data_from_portwine/scripts/portwine_db/Caliber @@ -4,6 +4,6 @@ #Rating=1-5 #####################examples########################### export PW_VULKAN_USE="2" -export PW_WINE_USE="WINE_LG" +export PW_WINE_USE="PROTON_LG" export PW_PREFIX_NAME="CALIBER" export DISABLE_CP_DEFPFX=1 diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index 5340192..9868ffa 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_no_mirror "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" +if try_download "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" no_mirror 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_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index 5f49d66..aba9b46 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" export PW_WINE_USE="WINE_LG" start_portwine -if try_download_no_mirror "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" +if try_download "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" no_mirror then try_remove_dir "$WINEPREFIX/drive_c/ProgramData/Battle.net" pw_kill_autostart Battle.net.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BDO b/data_from_portwine/scripts/pw_autoinstall/PW_BDO index 0adda90..4717c73 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BDO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BDO @@ -14,7 +14,7 @@ pw_clear_pfx start_portwine wait_wineserver -if try_download_no_mirror "https://nez-o-dn.playblackdesert.com/UploadData/installer/BlackDesert_Installer_RU.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://nez-o-dn.playblackdesert.com/UploadData/installer/BlackDesert_Installer_RU.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Black Desert Online. ${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 25e138d..25fbdc1 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_no_mirror "https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download"https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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 104f775..d0af413 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_no_mirror "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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 dfda15a..5600693 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -4,14 +4,14 @@ export PW_PREFIX_NAME="CALIBER" export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CaliberSetup.exe" -export PW_WINE_USE=WINE_LG +export PW_WINE_USE=PROTON_LG export DISABLE_CP_DEFPFX=1 export PORTWINE_CREATE_SHORTCUT_NAME="CALIBER" gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download_no_mirror "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} CALIBER. ${loc_gui_please_wait} " pw_kill_autostart VC_redist.x64.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER index d3abe26..41a1232 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CATSLAUNCHER @@ -8,7 +8,7 @@ export PW_USE_D3D_EXTRAS=1 export PORTWINE_CREATE_SHORTCUT_NAME="CatsLauncher" start_portwine -if try_download_no_mirror "https://catswhoplay.com/downloads/CatsLauncher_0.1.10.msi" "${PW_AUTOINSTALL_EXE}" +if try_download "https://catswhoplay.com/downloads/CatsLauncher_0.1.10.msi" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} CatsLauncher. ${loc_gui_please_wait} " pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU index 8978215..5ceb809 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CEMU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU @@ -4,7 +4,7 @@ export PW_URL_CEMU=($(curl -s "https://cemu.info" | grep "zip" | cut -d \" -f 2)) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/`echo ${PW_URL_CEMU} | awk -F/ '{print $5}'`" start_portwine -if try_download_no_mirror "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" +if try_download "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Cemu. ${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_CITRA b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA index 7159bda..36b3e82 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA @@ -7,7 +7,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Citra" start_portwine -if try_download_no_mirror "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Citra. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT index 1d998d6..1ffc041 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT @@ -7,7 +7,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Crossout" # export PW_PREFIX_NAME=DOTNET start_portwine -if try_download_no_mirror "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" +if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Crossout. ${loc_gui_please_wait} " pw_kill_autostart launcher.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_CWC b/data_from_portwine/scripts/pw_autoinstall/PW_CWC index efac261..c659ccd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CWC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CWC @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/CWClient_Install.exe" start_portwine -if try_download_no_mirror "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} CONTRACT WARS Client. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL b/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL index 2c6a427..6066ea0 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_DEMUL @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/demul07_280418.7z" start_portwine -if try_download_no_mirror "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" +if try_download "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Demul. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Demul" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN b/data_from_portwine/scripts/pw_autoinstall/PW_DOLPHIN index 764032e..052ae33 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_no_mirror "https://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}" no_mirror 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_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index cc1a1f5..133afb3 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -10,7 +10,7 @@ export PW_PREFIX_NAME="EAAPP" export PW_USE_EAC_AND_BE="1" start_portwine -if try_download_no_mirror "https://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}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " pw_kill_autostart EABackgroundSer 5 please & @@ -23,4 +23,4 @@ then kill_portwine portwine_create_shortcut fi -stop_portwine +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index ee92309..0eac4ec 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -9,7 +9,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Epic Games Launcher" try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" start_portwine -if try_download_no_mirror "https://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}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} 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 7842b2f..15faa91 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_no_mirror "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" no_mirror 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 03940a4..5cbf092 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -19,7 +19,8 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe" export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher" start_portwine -if try_download_no_mirror "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" ; then +if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror +then pw_start_progress_bar_block "${loc_gui_installing_the} EVE Online Launcher. ${loc_gui_please_wait} " EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX index 3e4db11..c6e3423 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_no_mirror "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-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}" no_mirror 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 c080bd1..6cc0f73 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_no_mirror "https://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 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT b/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT index e972f7d..2642685 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT @@ -8,7 +8,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Genshin Impact" start_portwine -if try_download_no_mirror "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "Installing Genshin Impact Launcher. ${loc_gui_please_wait} " pw_kill_autostart launcher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH b/data_from_portwine/scripts/pw_autoinstall/PW_GLYPH index fd645ce..dff0787 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_no_mirror "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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 4d5e5ef..aaa226e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -13,7 +13,7 @@ export PW_WINE_USE=PROTON_STEAM_8.0-4 start_portwine -if try_download_no_mirror "https://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://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} GOG Galaxy. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 index eb340c2..534ba97 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GUILD_WARS_2 @@ -10,7 +10,7 @@ start_portwine mkdir -p "${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files/Guild Wars 2/Gw2Setup-64.exe" -if try_download_no_mirror "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Guild Wars 2. ${loc_gui_please_wait} " pw_kill_autostart Gw2.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT index 3d7dcee..a68c03a 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_IGCLIENT @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/igclient_setup.exe" export PW_DLL_INSTALL="vcrun2019" start_portwine -if try_download_no_mirror "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Indiegala Client. ${loc_gui_please_wait} " pw_kill_autostart IGClient.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ITCH b/data_from_portwine/scripts/pw_autoinstall/PW_ITCH index 8b13c6d..b9fcc1e 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_no_mirror "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" +if try_download "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" no_mirror 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 17635a0..827134f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LGC @@ -7,7 +7,7 @@ export PW_PREFIX_NAME="LGC" start_portwine -if try_download_no_mirror "https://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}" no_mirror 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 c6241e5..77cfc07 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -16,7 +16,7 @@ gui_proton_downloader silent "${PW_WINE_USE}" pw_clear_pfx start_portwine wait_wineserver -if try_download_no_mirror "https://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}" no_mirror then pw_start_progress_bar_block "Installing League of Legends. ${loc_gui_please_wait} " if [ "${update_loc}" = "RUS" ] ; then diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MAME b/data_from_portwine/scripts/pw_autoinstall/PW_MAME index 9f992ec..c4d412d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MAME @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/mame0259b_64bit.exe" start_portwine -if try_download_no_mirror "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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_MW b/data_from_portwine/scripts/pw_autoinstall/PW_MW index 37f6c0b..0f07af1 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MW +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MW @@ -8,7 +8,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="Modern Warships" start_portwine -if try_download_no_mirror "https://gdn.gaijin.net/launcher/current.php?id=ModernWarshipsLauncher" "${PW_AUTOINSTALL_EXE}" +if try_download "https://gdn.gaijin.net/launcher/current.php?id=ModernWarshipsLauncher" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Modern Warships. ${loc_gui_please_wait} " pw_kill_autostart launcher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MWO b/data_from_portwine/scripts/pw_autoinstall/PW_MWO index 1f999e1..a3cb828 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MWO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MWO @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/s" "/nr" "/l=Russian") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MWO_Launcher_Setup.exe" start_portwine -if try_download_no_mirror "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" +if try_download "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Metal War Online. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index 7a91a09..11d406e 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_no_mirror "https://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}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Origin. ${loc_gui_please_wait}" # pw_kill_autostart Origin.exe & @@ -16,4 +16,4 @@ then kill_portwine portwine_create_shortcut fi -stop_portwine +stop_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_OSU b/data_from_portwine/scripts/pw_autoinstall/PW_OSU index ce38917..f808369 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -9,7 +9,7 @@ start_portwine 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_no_mirror "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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_PANZAR b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR index e9b1229..813f474 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR @@ -8,7 +8,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Panzar.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Panzar" start_portwine -if try_download_no_mirror "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" +if try_download "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Panzar. ${loc_gui_please_wait} " pw_kill_autostart start.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY index ce49aa2..4b729dd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -9,12 +9,12 @@ export PW_PREFIX_NAME="DOTNET" start_portwine -if try_download_no_mirror "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" +if try_download "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Plarium Play. ${loc_gui_please_wait}" pw_kill_autostart PlariumPlay.exe & pw_run "${PW_AUTOINSTALL_EXE}" - portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/PlariumPlay/PlariumPlay.exe" + portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/PlariumPlay/PlariumPlay.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_POE b/data_from_portwine/scripts/pw_autoinstall/PW_POE index 79d8b06..bb8c48b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_POE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_POE @@ -5,7 +5,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PathOfExileInstaller.exe" start_portwine -if try_download_no_mirror "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" +if try_download "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Path of Exile. ${loc_gui_please_wait}" pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP index 1439592..d3099e6 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PPSSPP @@ -1,10 +1,10 @@ #!/usr/bin/env bash # Author: chal55rus (Sergey P.) -########################################################################## +########################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/PPSSPPSetup.exe" start_portwine -if try_download_no_mirror "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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 54e07cf..5efbcdf 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -11,11 +11,11 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Project64${PR64_VER}setup.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Project64" start_portwine -if try_download_no_mirror "https://www.pj64-emu.com/download/project64${PR64_VER}installer" "${PW_AUTOINSTALL_EXE}" +if try_download "https://www.pj64-emu.com/download/project64${PR64_VER}installer" "${PW_AUTOINSTALL_EXE}" no_mirror then GET_URL_POSTFIX="$(cat "${PW_AUTOINSTALL_EXE}" | grep "Did your download not start?" | awk -F"$PR64_VER" '{print $2}' | awk -F'/' '{print $1}')" try_remove_file "${PW_AUTOINSTALL_EXE}" - try_download_no_mirror "https://www.pj64-emu.com/file/setup-project64${PR64_VER}${GET_URL_POSTFIX}/" "${PW_AUTOINSTALL_EXE}" + try_download "https://www.pj64-emu.com/file/setup-project64${PR64_VER}${GET_URL_POSTFIX}/" "${PW_AUTOINSTALL_EXE}" no_mirror pw_start_progress_bar_block "${loc_gui_installing_the} Project64. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/Project64 3.0/Project64.exe" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE index 0cd7cf7..4e72513 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PULSE_ONLINE @@ -9,7 +9,7 @@ start_portwine mkdir -p "${WINEPREFIX}/drive_c/games/PulseOnline/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/games/PulseOnline/PulseOnlineLauncher.exe" -if try_download_no_mirror "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://pulseonline.ru/game_download/PulseOnlineLauncher.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then export portwine_exe="$PW_AUTOINSTALL_EXE" try_remove_file "${portwine_exe}.ppdb" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index ea2f38e..92f149f 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_no_mirror "https://buildbot.libretro.com/stable/1.16.0/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}" no_mirror 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_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 5bf403c..5b93ec1 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" export PORTWINE_CREATE_SHORTCUT_NAME="Rockstar" start_portwine -if try_download_no_mirror "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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_SO b/data_from_portwine/scripts/pw_autoinstall/PW_SO index 263e871..4fe3351 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SO @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/S") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SO_installer.exe" start_portwine -if try_download_no_mirror "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Stalker Online. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT b/data_from_portwine/scripts/pw_autoinstall/PW_STALCRAFT index e52f0cb..8b71881 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_no_mirror "https://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}" no_mirror 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_STAR_RAIL b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL index 7c25a62..9165cda 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL @@ -7,7 +7,7 @@ export PW_USE_D3D_EXTRAS=1 start_portwine -if try_download_no_mirror "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "Installing Honkai Star Rail Launcher. ${loc_gui_please_wait} " pw_kill_autostart launcher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_STEAM b/data_from_portwine/scripts/pw_autoinstall/PW_STEAM index 3381fad..a7f4a90 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_no_mirror "https://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}" no_mirror 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 6e71c1e..9e5b74c 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SWL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SWL @@ -6,7 +6,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/SecretWorldLegendsMin.exe" start_portwine -if try_download_no_mirror "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Secret World Legends. ${loc_gui_please_wait} " pw_kill_autostart ClientPatcher.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_UBC b/data_from_portwine/scripts/pw_autoinstall/PW_UBC index d8a754e..ceda949 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_no_mirror "https://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}" no_mirror 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 b8db462..efdd04e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VBA-M @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/visualboyadvance-m-Win-x86_64.zip" start_portwine -if try_download_no_mirror "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.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}" no_mirror 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 c767a72..2c0e9b4 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_VKPLAY @@ -8,7 +8,7 @@ export WINEDLLOVERRIDES="mscoree,mshtml=" export PW_MUST_HAVE_DLL="" start_portwine -if try_download_no_mirror "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" no_mirror 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_WARFRAME b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME index 44dd59e..7e70029 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Warframe.msi" export PORTWINE_CREATE_SHORTCUT_NAME="Warframe" start_portwine -if try_download_no_mirror "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" +if try_download "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Warframe. ${loc_gui_please_wait} " pw_kill_autostart Launcher.exe 3 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index babb482..5ff7a4a 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WGC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WGC @@ -8,7 +8,7 @@ export PW_PREFIX_NAME="WGC" start_portwine -if try_download_no_mirror "https://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}" no_mirror 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 3a0fc36..fb426cd 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WOSB +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WOSB @@ -11,7 +11,7 @@ WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseaba [[ ! -z "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER." start_portwine -if try_download_no_mirror "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "Installing World of Sea Battle. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_XEMU b/data_from_portwine/scripts/pw_autoinstall/PW_XEMU index 6ef54ad..7e3bc9f 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_XEMU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_XEMU @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xemu-win-release.zip" start_portwine -if try_download_no_mirror "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} xemu. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/xemu" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_XENIA b/data_from_portwine/scripts/pw_autoinstall/PW_XENIA index 6c04b9a..a65f44e 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_XENIA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_XENIA @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/xenia_master.zip" start_portwine -if try_download_no_mirror "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" +if try_download "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Xenia. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/xenia" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE b/data_from_portwine/scripts/pw_autoinstall/PW_YABAUSE index 05d276b..8d838ee 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_no_mirror "https://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}" no_mirror then pw_start_progress_bar_block "${loc_gui_installing_the} Yabause. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 574517a..ec0a685 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2276 +#SCRIPTS_NEXT_VERSION=2277 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"