diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 6b8bba0..66892de 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,16 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2256### Date: 13.02.2024 / Download update size: 15 megabytes +* updated WINE_LG to version 9-2 +* updated versions: + D8VK "1.7.1-2367" + DXVK_GIT "2.3-57" + VKD3D_GIT "1.1-3908" +* fixed FAKE_DLSS in some games (CyberFSR project) +* improved download functions +* for Steam Deck, the launch of some games has been fixed only from the second time + ###Scripts version 2255### Date: 12.02.2024 / Download update size: 15 megabytes * the portable versions of MANGOHUD and GAMESCOPE are disabled for Steam Deck in Gaming Mode * small additional script improvements diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 1b9192f..bbd13ac 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,7 +2,17 @@ ----------------------------------------- История изменений: -###Scripts version 2255### Дата: 11.02.2024 / Размер скачиваемого обновления: 15 мегабайт +###Scripts version 2256### Дата: 13.02.2024 / Размер скачиваемого обновления: 15 мегабайт +* обновлен WINE_LG до версии 9-2 +* обновлены версии: + D8VK "1.7.1-2367" + DXVK_GIT "2.3-57" + VKD3D_GIT "1.1-3908" +* исправлена работа FAKE_DLSS в некоторых играх (проект CyberFSR) +* улучшены функции скачивания +* для Steam Deck исправлен запуск некоторых игр только со второго раза + +###Scripts version 2255### Дата: 12.02.2024 / Размер скачиваемого обновления: 15 мегабайт * для Steam Deck в режиме Gaming Mode отключены портативные версии MANGOHUD и GAMESCOPE * небольшие дополнительные улучшения скриптов diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 33d874b..47d7e61 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -26,10 +26,10 @@ print_info () { } export -f print_info -print_debug () { - printf "\E[35m%s Debug: $@ %s\e[0m\n" +print_ok () { + printf "\E[35m%s OK: $@ %s\e[0m\n" } -export -f print_debug +export -f print_ok print_var () { for vp in $@ ; do print_info "${vp}=${!vp}" ; done @@ -115,23 +115,24 @@ try_force_link_dir () { export -f try_force_link_dir check_process () { - [ ! -n "`ps cax | grep "$1" | awk '{print $1}'`" ] && return 0 || return 1 + [ ! -n "`ps cax | grep "$1" | awk '{print $1}'`" ] && return 0 || return 1 } export -f check_process -try_download_game () { +try_download_no_mirror () { [[ -f "${PW_AUTOINSTALL_EXE}" ]] && try_remove_file "${PW_AUTOINSTALL_EXE}" - PW_DOWNLOAD_FILE_NAME="$(basename $1)" + PW_DOWNLOAD_FILE_NAME="$(basename $2)" set -o pipefail - curl -C - -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ + curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then - print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME}." - return 1 + print_error "Failed to download $PW_DOWNLOAD_FILE_NAME" + return 1 else + print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1" return 0 fi } @@ -140,7 +141,7 @@ try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" [[ ! -f "${pw_yad_v12_3}" ]] && local pw_yad_v12_3="yad" set -o pipefail - curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ + curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ @@ -148,43 +149,47 @@ try_download () { if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub." print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP" - curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \ + curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP." - return 1 + return 1 fi fi try_remove_file "${PORT_WINE_TMP_PATH}/download_log" + print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1" return 0 } try_download_to_path () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail - curl -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ + curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ "${pw_yad_v12_3}" --progress --percentage=0 --text="Download ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 if [ "${PIPESTATUS[0]}" != 0 ] ; then - print_error "Failed to download $1." - return 1 - else + print_error "Failed to download $PW_DOWNLOAD_FILE_NAME" + return 1 + else + print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1" return 0 fi } try_download_silent () { - curl -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" - if [ "${PIPESTATUS[0]}" != 0 ] ; then - print_error "Failed to download $1. Skipping." + PW_DOWNLOAD_FILE_NAME="$(basename $1)" + curl -f -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" + if [ "$?" != 0 ] ; then + print_error "Failed to download $PW_DOWNLOAD_FILE_NAME. Skipping." try_remove_file "$2" - return 1 - else + return 1 + else + print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1" return 0 fi } @@ -263,7 +268,7 @@ unpack_tar_zst () { set -o pipefail unset PW_ZSTD_PORT pw_start_progress_bar_cover_block "${PW_GUI_ICON_PATH}/covers/unpacking_${update_loc}.gif" - if [[ `command -v zstd` ]] &>/dev/null ; then + if command -v zstd &>/dev/null ; then tar -I zstd -xhvf "$1" -C "$2" pw_stop_progress_bar_cover_block [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 @@ -361,7 +366,7 @@ pw_reinstall_pp () { try_remove_file "${PORT_WINE_TMP_PATH}/scripts_ver" echo print_info "Restarting PP for reinstall files..." - export SKIP_CHECK_UPDATES=1 + export SKIP_CHECK_UPDATES=0 /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 } @@ -709,7 +714,8 @@ pw_download_libs () { || [[ ! -f "${PW_WINELIB}/pressure-vessel/bin/pv-bwrap" ]] then print_info "Download and install libraries..." - if try_download "github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then + if try_download "github.com/Castro-Fidel/PortWINE/releases/download/libs${PW_LIBS_VER}/libs${PW_LIBS_VER}.tar.xz" \ + "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/" ; then try_remove_file "${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}.tar.xz" if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep libs_v | grep -v libs${PW_LIBS_VER}`" ] ; then @@ -754,7 +760,8 @@ pw_check_and_download_wine () { fi if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then print_info "Download and install ${PW_WINE_USE}..." - 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 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 echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}/version" try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" @@ -778,7 +785,8 @@ pw_check_and_download_dxvk_and_vkd3d () { for DXVK_VAR_VER in "${DXVK_STABLE_VER}" "${DXVK_GIT_VER}" ; do if [ ! -d "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}" ] ; then print_info "Download and install DXVK v.${DXVK_VAR_VER}" - if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/dxvk-${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" ; then + if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/dxvk-${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.xz" \ + "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" ; then if unpack_tar_xz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.xz" else @@ -787,7 +795,8 @@ pw_check_and_download_dxvk_and_vkd3d () { yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi - elif try_download "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then + elif try_download_no_mirror "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" \ + "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then if unpack_tar_gz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}" ; then try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" else @@ -806,7 +815,8 @@ pw_check_and_download_dxvk_and_vkd3d () { for VKD3D_VAR_VER in "${VKD3D_STABLE_VER}" "${VKD3D_GIT_VER}" ; do if [ ! -d "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}" ] ; then print_info "Download and install VKD3D-PROTON v.${VKD3D_VAR_VER}" - if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/vkd3d-proton-${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" ; then + if try_download "https://github.com/Castro-Fidel/vulkan/releases/download/vkd3d-proton-${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" \ + "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" ; then if unpack_tar_xz "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" "${PW_VULKAN_DIR}" ; then try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.xz" else @@ -815,7 +825,8 @@ pw_check_and_download_dxvk_and_vkd3d () { yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 fi - elif try_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then + elif try_download_no_mirror "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" \ + "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then if unpack_tar_zst "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}" ; then try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" else @@ -885,7 +896,8 @@ pw_check_and_download_plugins () { else PW_NOTIFY_TEXT="Please wait for update PortProton" pw_notify_send -u critical - if try_download_silent "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then + if try_download_silent "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" \ + "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" if [ ! -z "`ls ${PORT_WINE_TMP_PATH} | grep plugins_v | grep -v plugins${PW_PLUGINS_VER}`" ] ; then @@ -1012,13 +1024,13 @@ pw_port_update () { fi export scripts_install_ver=`cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1` print_info "Check update..." - if curl -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + if curl -f -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine" URL_TO_PW_MASTER="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" print_info "OK." else - if curl -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + if curl -f -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then URL_FOR_CHANGELOG="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine" URL_TO_PW_MASTER="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/master/PortWINE-master.tar.gz" @@ -1059,7 +1071,7 @@ pw_port_update () { echo "######################################################" print_info "Update scripts..." try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" - if try_download "${URL_TO_PW_MASTER}" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then + if try_download_no_mirror "${URL_TO_PW_MASTER}" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" "${PORT_WINE_TMP_PATH}" then create_new_dir "${PORT_WINE_TMP_PATH}/scripts_backup" @@ -1097,7 +1109,7 @@ update_winetricks () { W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" print_info "Version winetricks in port: ${W_TRX_INT_VER}" if [[ ! -f "${PORT_WINE_TMP_PATH}/winetricks" && ! -z "$W_TRX_EXT_VER" ]] || [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" && ! -z "$W_TRX_EXT_VER" ]]; then - if try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new" ; then + if try_download_no_mirror "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks_new" ; then mv -f "${PORT_WINE_TMP_PATH}/winetricks_new" "${PORT_WINE_TMP_PATH}/winetricks" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})" chmod u+x "${PORT_WINE_TMP_PATH}/winetricks" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index aa1a2d1..5340192 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_game "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index 3d02c54..d2c00ca 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -5,7 +5,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" start_portwine -if try_download_game "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" then # PW_START_PROGRESS_BAR "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} " try_remove_dir "$WINEPREFIX/drive_c/ProgramData/Battle.net" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA b/data_from_portwine/scripts/pw_autoinstall/PW_BETHESDA index 8da0d7d..25e138d 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_game "https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 68c9e41..104f775 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_game "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 7ec1547..12c4c1f 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -11,7 +11,7 @@ export PORTWINE_CREATE_SHORTCUT_NAME="CALIBER" gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download_game "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" 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_CEMU b/data_from_portwine/scripts/pw_autoinstall/PW_CEMU index 6293640..8978215 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_game "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" 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 59a09d9..7159bda 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_game "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" 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 acb22ce..1d998d6 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_game "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" 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 f52b223..efac261 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_game "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" 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 36b0071..2c6a427 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_game "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" 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 900433b..764032e 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_game "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 db96ffe..d086138 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_game "https://github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 79bf597..cc1a1f5 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_game "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 EABackgroundSer 5 please & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 0c1f08a..60f7cc8 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_game "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 0582f01..7842b2f 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_game "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 d4e2fbf..03940a4 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -19,7 +19,7 @@ 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_game "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" ; then +if try_download_no_mirror "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" ; 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 272391a..3e4db11 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_game "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-win64.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 e183052..c080bd1 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_game "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 6c1c62a..e972f7d 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_game "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" 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 d3af8b2..fd645ce 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_game "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 cdd249b..4d5e5ef 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_game "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_no_mirror "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.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}" 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 7fab05d..eb340c2 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_game "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" 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 e6a92d9..3d7dcee 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_game "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" 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 2ae14fc..8b13c6d 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_game "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 793e7da..17635a0 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_game "https://redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 5955f2e..c6241e5 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_game "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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} " 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 73569e4..9f992ec 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_game "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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_MW b/data_from_portwine/scripts/pw_autoinstall/PW_MW index 7078894..37f6c0b 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_game "https://gdn.gaijin.net/launcher/current.php?id=ModernWarshipsLauncher" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://gdn.gaijin.net/launcher/current.php?id=ModernWarshipsLauncher" "${PW_AUTOINSTALL_EXE}" 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 e2886ba..1f999e1 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_game "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" 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 f97f8d5..7a91a09 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_game "https://origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 e928606..ce38917 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_game "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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_PANZAR b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR index 12f84e2..e9b1229 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_game "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" 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 28cc89e..ce49aa2 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PLARIUM_PLAY @@ -9,7 +9,7 @@ export PW_PREFIX_NAME="DOTNET" start_portwine -if try_download_game "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Plarium Play. ${loc_gui_please_wait}" pw_kill_autostart PlariumPlay.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_POE b/data_from_portwine/scripts/pw_autoinstall/PW_POE index e76e6ce..79d8b06 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_game "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" 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 47f8fdf..1439592 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_game "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 34b4e11..54e07cf 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_game "https://www.pj64-emu.com/download/project64${PR64_VER}installer" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://www.pj64-emu.com/download/project64${PR64_VER}installer" "${PW_AUTOINSTALL_EXE}" 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_game "https://www.pj64-emu.com/file/setup-project64${PR64_VER}${GET_URL_POSTFIX}/" "${PW_AUTOINSTALL_EXE}" + try_download_no_mirror "https://www.pj64-emu.com/file/setup-project64${PR64_VER}${GET_URL_POSTFIX}/" "${PW_AUTOINSTALL_EXE}" 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_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index 2f15206..ea2f38e 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_game "https://buildbot.libretro.com/stable/1.16.0/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 2ccb62c..51dd015 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -10,7 +10,7 @@ export PW_MUST_HAVE_DLL="" export PORTWINE_CREATE_SHORTCUT_NAME="RobloxPlayerBeta" start_portwine -if try_download_game "https://setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" then pw_kill_autostart MicrosoftEdge & pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 1e9a0f5..5bf403c 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_game "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 bf9e195..1e12d93 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_RPCS3 @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/rpcs3-v0.0.29-15676-9fce7080_win64.7z" start_portwine -if try_download_game "https://github.com/RPCS3/rpcs3-binaries-win/releases/download/build-9fce70809ee06a7e61a3dbe5bb9b0179fc541d9f/rpcs3-v0.0.29-15676-9fce7080_win64.7z" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 5fe9013..a64c4be 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM +++ b/data_from_portwine/scripts/pw_autoinstall/PW_SCUMMVM @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/scummvm-2.7.1-win32.exe" start_portwine -if try_download_game "https://downloads.scummvm.org/frs/scummvm/2.7.1/scummvm-2.7.1-win32.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_SO b/data_from_portwine/scripts/pw_autoinstall/PW_SO index 679b8e0..263e871 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_game "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" 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 41038cf..e52f0cb 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_game "https://exbo2.b-cdn.net/EXBO_Setup_ru.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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_STAR_RAIL b/data_from_portwine/scripts/pw_autoinstall/PW_STAR_RAIL index 13c8d99..7c25a62 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_game "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" 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 6a3e87a..3381fad 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_game "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 2610471..6e71c1e 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_game "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" 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 2d012dc..d8a754e 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_game "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 8661a3f..b8db462 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_game "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 4886217..c767a72 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_game "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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_WARFRAME b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME index 7bd36a1..44dd59e 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_game "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" 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 664a8bd..babb482 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_game "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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 149c853..3a0fc36 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_game "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" 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 e1e2de4..6ef54ad 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_game "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" 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 844d519..6c04b9a 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_game "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" 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 921a9f5..05d276b 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_game "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_no_mirror "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}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index 0becf59..49f4ac5 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -137,7 +137,15 @@ start_portwine () { enabled_fake_nvidia_videocard () { - if [[ "${1}" == 1 ]] ; then + if [[ "${1}" == old ]] ; then + sed -i /'dxgi.customDeviceDesc =/c # dxgi.customDeviceDesc =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customDeviceId =/c dxgi.customDeviceId = 222F' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.hideAmdGpu =/c # dxgi.hideAmdGpu =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.hideNvidiaGpu =/c # dxgi.hideNvidiaGpu =' "${DXVK_CONFIG_FILE}" + unset WINE_HIDE_NVIDIA_GPU WINE_HIDE_AMD_GPU + unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS + elif [[ "${1}" == new ]] ; then sed -i /'dxgi.customDeviceDesc =/c dxgi.customDeviceDesc = "NVIDIA GeForce RTX 4090"' "${DXVK_CONFIG_FILE}" sed -i /'dxgi.customDeviceId =/c dxgi.customDeviceId = 2684' "${DXVK_CONFIG_FILE}" sed -i /'dxgi.customVendorId =/c dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" @@ -148,11 +156,11 @@ start_portwine () { export DXVK_NVAPI_DRIVER_VERSION=53713 export DXVK_NVAPI_ALLOW_OTHER_DRIVERS=1 elif [[ "${1}" == 0 ]] ; then - sed -i /'dxgi.customDeviceDesc =/c # dxgi.customDeviceDesc = "NVIDIA GeForce RTX 4090"' "${DXVK_CONFIG_FILE}" - sed -i /'dxgi.customDeviceId =/c # dxgi.customDeviceId = 2684' "${DXVK_CONFIG_FILE}" - sed -i /'dxgi.customVendorId =/c # dxgi.customVendorId = 10de' "${DXVK_CONFIG_FILE}" - sed -i /'dxgi.hideAmdGpu =/c # dxgi.hideAmdGpu = True' "${DXVK_CONFIG_FILE}" - sed -i /'dxgi.hideNvidiaGpu =/c # dxgi.hideNvidiaGpu = False' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customDeviceDesc =/c # dxgi.customDeviceDesc =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customDeviceId =/c # dxgi.customDeviceId =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.customVendorId =/c # dxgi.customVendorId =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.hideAmdGpu =/c # dxgi.hideAmdGpu =' "${DXVK_CONFIG_FILE}" + sed -i /'dxgi.hideNvidiaGpu =/c # dxgi.hideNvidiaGpu =' "${DXVK_CONFIG_FILE}" unset WINE_HIDE_NVIDIA_GPU WINE_HIDE_AMD_GPU unset DXVK_NVAPI_DRIVER_VERSION DXVK_NVAPI_ALLOW_OTHER_DRIVERS fi @@ -178,12 +186,12 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_3_VER}/dlssg_to_fsr3_amd_is_better.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/nvngx/_nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update "nvapi,nvapi64,nvngx,_nvngx,dlssg_to_fsr3_amd_is_better=n;nvcuda=b" - enabled_fake_nvidia_videocard 1 + enabled_fake_nvidia_videocard new export WINEHAGS=1 elif [[ "${PW_USE_FAKE_DLSS}" == 1 ]] && [[ -d "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/" ]] ; then try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/fake_dlss/${PW_FAKE_DLSS_VER}/nvngx.ini" "${WINEPREFIX}/drive_c/windows/system32/" - enabled_fake_nvidia_videocard 1 + enabled_fake_nvidia_videocard old var_winedlloverride_update "nvapi,nvapi64,nvngx=n;_nvngx=;nvcuda=b" elif [[ "${PW_USE_NVAPI_AND_DLSS}" == 1 ]] ; then FIND_NVNGX="$(dirname $(find /usr/* -type f -name "nvngx.dll" 2>/dev/null | head -n 1 | awk '{print $1}'))" @@ -228,6 +236,7 @@ start_portwine () { || [[ "${PW_USE_DXR10}" == 1 ]] \ || [[ "${PW_USE_RAY_TRACING}" == 1 ]] then + export VKD3D_FEATURE_LEVEL="12_1" var_vkd3d_config_update dxr var_radv_perftest_config_update rt else @@ -588,6 +597,7 @@ start_portwine () { print_info "Try link native D8VK file..." try_force_link_file "${PATH_TO_D8VK_FILES}/x32/d3d8.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" + try_force_link_file "${PATH_TO_D8VK_FILES}/x64/d3d8.dll" "${WINEPREFIX}/drive_c/windows/system32/" var_winedlloverride_update d3d8=n fi @@ -740,7 +750,7 @@ pw_run () { echo "------------------------------------" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "" - print_debug "Log from RUNTIME and WINE:" + print_info "Log from RUNTIME and WINE:" ${PW_RUN_GAMESCOPE} \ ${pw_runtime} \ env PATH="${PATH}" \ @@ -758,7 +768,7 @@ pw_run () { fi echo "" echo "Log WINE:" > "${PW_LOG_TO_FILE}" - print_debug "Log from RUNTIME and WINE:" + print_info "Log from RUNTIME and WINE:" ${PW_RUN_GAMESCOPE} \ ${pw_runtime} \ env PATH="${PATH}" \ diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index d2f4e6e..d0d86a6 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=2255 +#SCRIPTS_NEXT_VERSION=2256 ######################################################################## export PW_MANGOHUD="0" export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" @@ -43,15 +43,15 @@ export PW_FAKE_DLSS_3_VER="090" export PW_GALLIUM_NINE_VER="0.9" ###WINE_AND_PROTON_LG### export PW_PROTON_LG_VER="PROTON_LG_8-25-2" -export PW_WINE_LG_VER="WINE_LG_9-0" +export PW_WINE_LG_VER="WINE_LG_9-2" export PW_WINE_FULLSCREEN_FSR="1" ###DXVK_AND_VKD3D### export VKD3D_LIMIT_TESS_FACTORS="64" -export D8VK_VER="1.0" +export D8VK_VER="1.7.1-2367" export DXVK_STABLE_VER="1.10.3-28" -export DXVK_GIT_VER="2.3-26" +export DXVK_GIT_VER="2.3-57" export VKD3D_STABLE_VER="1.1-2602" -export VKD3D_GIT_VER="1.1-3821" +export VKD3D_GIT_VER="1.1-3908" ###PREFIX_VERSION### export DOTPFX_VER="48v2" export DEFPFX_VER="v1" diff --git a/data_from_portwine/scripts/yad_gui b/data_from_portwine/scripts/yad_gui index 83c8071..e44fe68 100755 --- a/data_from_portwine/scripts/yad_gui +++ b/data_from_portwine/scripts/yad_gui @@ -105,7 +105,7 @@ pw_update_pfx_cover_gui () { pw_start_progress_bar_cs () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@" --pulsate --close-on-unfocus \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 > /dev/null 2>&1 & + --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_CS="$!" return 0 fi @@ -114,7 +114,7 @@ pw_start_progress_bar_cs () { pw_start_progress_bar_block () { if ! check_start_from_steam ; then "${pw_yad}" --progress --progress-text="$@" --pulsate \ - --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 > /dev/null 2>&1 & + --no-buttons --undecorated --center --skip-taskbar --width=500 --wrap-width=500 &>/dev/null & export PW_YAD_PID_PROGRESS_BAR_BLOCK="$!" return 0 fi @@ -124,20 +124,20 @@ pw_stop_progress_bar () { for PW_KILL_YAD_PID in "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" \ "$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER" do - kill -s SIGUSR1 "$PW_KILL_YAD_PID" > /dev/null 2>&1 + kill -s SIGUSR1 "$PW_KILL_YAD_PID" &>/dev/null done return 0 } export -f pw_stop_progress_bar pw_stop_progress_bar_cover () { - kill -s KILL "$PW_YAD_PID_PROGRESS_BAR_COVER" > /dev/null 2>&1 + kill -s KILL "$PW_YAD_PID_PROGRESS_BAR_COVER" &>/dev/null return 0 } export -f pw_stop_progress_bar_cover pw_stop_progress_bar_cover_block () { - kill -s KILL "$PW_YAD_PID_PROGRESS_BAR_COVER_BLOCK" > /dev/null 2>&1 + kill -s KILL "$PW_YAD_PID_PROGRESS_BAR_COVER_BLOCK" &>/dev/null return 0 } export -f pw_stop_progress_bar_cover_block @@ -145,7 +145,7 @@ export -f pw_stop_progress_bar_cover_block open_changelog () { "${pw_yad}" --title="$loc_gui_changelog" --borders=${YAD_BORDERS} --no-buttons --text-align=center \ --text-info --show-uri --wrap --width=1200 --height=700 --uri-color=red \ - --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" + --filename="${PORT_WINE_PATH}/data/${PW_CHANGELOG_FILE}" &>/dev/null } export -f open_changelog @@ -210,7 +210,6 @@ pw_gui_for_edit_db () { GET_GPU_NAMES=$("$PW_VULKANINFO_PORTABLE" 2>/dev/null | awk -F '=' '/deviceName/{print $2}' | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!') - logical_cores=$(grep -c "^processor" /proc/cpuinfo) if [[ "${logical_cores}" -le "4" ]] ; then GET_LOGICAL_CORE="1!$(seq -s! 1 $((${logical_cores} - 1)))" @@ -308,6 +307,11 @@ pw_gui_for_edit_db () { gui_proton_downloader () { + if [[ "$PW_WINE_USE" == PROTON_LG ]] + then export PW_WINE_USE="${PW_PROTON_LG_VER}" + elif [[ "$PW_WINE_USE" == WINE_*_LG ]] || [[ "$PW_WINE_USE" == WINE_LG ]] + then export PW_WINE_USE="${PW_WINE_LG_VER}" + fi if [[ "$1" == "silent" ]] && [[ -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ]] ; then return 0 fi