From 97f9b10c67097de3fb572b12623a0b460b5f841b Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Sat, 25 Nov 2023 22:23:25 +0300 Subject: [PATCH] Scripts version 2232 --- data_from_portwine/changelog_eng | 5 + data_from_portwine/changelog_rus | 7 + data_from_portwine/scripts/add_in_steam.sh | 120 ++++++++++++++++++ data_from_portwine/scripts/functions_helper | 60 ++++++--- data_from_portwine/scripts/lang | 8 +- data_from_portwine/scripts/portwine_db/MWO | 4 +- .../scripts/pw_autoinstall/PW_ANKAMA | 2 +- .../scripts/pw_autoinstall/PW_BATTLE_NET | 2 +- .../scripts/pw_autoinstall/PW_BETHESDA | 2 +- .../scripts/pw_autoinstall/PW_BSR | 2 +- .../scripts/pw_autoinstall/PW_CALIBER | 2 +- .../scripts/pw_autoinstall/PW_CEMU | 2 +- .../scripts/pw_autoinstall/PW_CITRA | 2 +- .../scripts/pw_autoinstall/PW_CROSSOUT | 2 +- .../scripts/pw_autoinstall/PW_CWC | 2 +- .../scripts/pw_autoinstall/PW_DEMUL | 2 +- .../scripts/pw_autoinstall/PW_DOLPHIN | 2 +- .../scripts/pw_autoinstall/PW_DUCKSTATION | 2 +- .../scripts/pw_autoinstall/PW_EAAPP | 2 +- .../scripts/pw_autoinstall/PW_EPIC | 2 +- .../scripts/pw_autoinstall/PW_EPSXE | 2 +- .../scripts/pw_autoinstall/PW_EVE | 2 +- .../scripts/pw_autoinstall/PW_FCEUX | 2 +- .../scripts/pw_autoinstall/PW_GAMEFORGE | 2 +- .../scripts/pw_autoinstall/PW_GENSHIN_IMPACT | 2 +- .../scripts/pw_autoinstall/PW_GLYPH | 2 +- .../scripts/pw_autoinstall/PW_GOG | 2 +- .../scripts/pw_autoinstall/PW_GUILD_WARS_2 | 2 +- .../scripts/pw_autoinstall/PW_IGCLIENT | 2 +- .../scripts/pw_autoinstall/PW_ITCH | 2 +- .../scripts/pw_autoinstall/PW_LGC | 2 +- .../scripts/pw_autoinstall/PW_LOL | 2 +- .../scripts/pw_autoinstall/PW_MAME | 2 +- .../scripts/pw_autoinstall/PW_MWO | 8 +- .../scripts/pw_autoinstall/PW_ORIGIN | 2 +- .../scripts/pw_autoinstall/PW_OSU | 2 +- .../scripts/pw_autoinstall/PW_PANZAR | 2 +- .../scripts/pw_autoinstall/PW_PLARIUM_PLAY | 2 +- .../scripts/pw_autoinstall/PW_POE | 2 +- .../scripts/pw_autoinstall/PW_PPSSPP | 2 +- .../scripts/pw_autoinstall/PW_PROJECT64 | 2 +- .../scripts/pw_autoinstall/PW_RETROARCH | 2 +- .../scripts/pw_autoinstall/PW_ROBLOX | 2 +- .../scripts/pw_autoinstall/PW_ROCKSTAR | 2 +- .../scripts/pw_autoinstall/PW_RPCS3 | 2 +- .../scripts/pw_autoinstall/PW_SCUMMVM | 2 +- .../scripts/pw_autoinstall/PW_SO | 2 +- .../scripts/pw_autoinstall/PW_STALCRAFT | 2 +- .../scripts/pw_autoinstall/PW_STAR_RAIL | 2 +- .../scripts/pw_autoinstall/PW_STEAM | 2 +- .../scripts/pw_autoinstall/PW_SWL | 2 +- .../scripts/pw_autoinstall/PW_UBC | 2 +- .../scripts/pw_autoinstall/PW_VBA-M | 2 +- .../scripts/pw_autoinstall/PW_VKPLAY | 2 +- .../scripts/pw_autoinstall/PW_WARFRAME | 8 +- .../scripts/pw_autoinstall/PW_WGC | 2 +- .../scripts/pw_autoinstall/PW_WOSB | 2 +- .../scripts/pw_autoinstall/PW_XEMU | 2 +- .../scripts/pw_autoinstall/PW_XENIA | 2 +- .../scripts/pw_autoinstall/PW_YABAUSE | 2 +- data_from_portwine/scripts/runlib | 65 +++++++--- data_from_portwine/scripts/start.sh | 10 +- data_from_portwine/scripts/var | 3 +- data_from_portwine/scripts/zen_yad_gui | 110 +++++++--------- 64 files changed, 350 insertions(+), 162 deletions(-) create mode 100755 data_from_portwine/scripts/add_in_steam.sh diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index eda69a91..29325b37 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2232### Date: 26.11.2023 / Download update size: 8 megabytes +* added choose video card in settings (thanks Boria138) +* added create shortcut to STEAM (Thanks: Akai, Boria138, Cefeiko, Vano, redroot, project steamtinkerlaunch and set -x) +* minor updated + ###Scripts version 2231### Date: 24.11.2023 / Download update size: 200 megabytes * updated PROTON_LG to version 8-24 * updated autoinstall: World of Sea Battle x64 (thanks Iglu47 and Cefeiko) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 7b096bfa..64fa84c3 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,13 @@ ----------------------------------------- История изменений: +###Scripts version 2232### Дата: 26.11.2023 / Размер скачиваемого обновления: 8 мегабайт +* добавлен глобальный выбор видеокарты в настройках PortProton при запуске игры/программы (спасибо Boria138) +* добавлено создание ярлыков в STEAM (Спасибо: Akai, Boria138, Cefeiko, Vano, redroot, проект steamtinkerlaunch и всевидящий set -x) +* дополнительные улучшения скриптов +* исправлена проблема скачивания установщиков игр (сайты которых не работают с докачкой файлов с помощью wget) +* начата миграция установки PortProton v1.3 с нового репозитория https://github.com/Castro-Fidel/PortProton_ALT + ###Scripts version 2231### Дата: 24.11.2023 / Размер скачиваемого обновления: 200 мегабайт * обновлен PROTON_LG до версии 8-24 * обновлён установщик World of Sea Battle x64 (спасибо @Iglu47 и Cefeiko) diff --git a/data_from_portwine/scripts/add_in_steam.sh b/data_from_portwine/scripts/add_in_steam.sh new file mode 100755 index 00000000..da8a24d1 --- /dev/null +++ b/data_from_portwine/scripts/add_in_steam.sh @@ -0,0 +1,120 @@ +#!/bin/bash +# GPL-3.0 license +# based on https://github.com/sonic2kk/steamtinkerlaunch/blob/master/steamtinkerlaunch + +PROGNAME="PortProton" +# PERSONAL_NAME="$(grep PersonaName "$HOME/.local/share/Steam/config/loginusers.vdf" | awk -F'"' '{print $4}')" + +STUIDPATH="$(find "$HOME/.local/share/Steam/userdata/" -maxdepth 1 -type d -name "[1-9]*" | head -n1)" +SCVDF="shortcuts.vdf" +SCPATH="$STUIDPATH/config/$SCVDF" + +NOSTAPPNAME="$name_desktop" +NOSTEXEPATH="\"${STEAM_SCRIPTS}/${name_desktop}.sh\"" +NOSTSTDIR="\"${STEAM_SCRIPTS}\"" +# icon +NOSTICONPATH="${PORT_WINE_PATH}/data/img/${name_desktop}.png" +# IsHidden +NOSTHIDE=0 +# AllowDesktopConfig +NOSTADC=0 +# AllowOverlay +NOSTAO=0 +# openvr +NOSTVR=0 +NOSTSTLLO=0 +# LaunchOptions +NOSTLAOP= + +if [ -n "${NOSTEXEPATH}" ]; then + if [ -z "${NOSTAPPNAME}" ]; then + NOSTAPPNAME="${QEP##*/}" + fi + + NOSTAIDRHX="$(printf "%03x%03x%02x\n" $((RANDOM%4096)) $((RANDOM%4096)) $((RANDOM%256)))" + #NOSTAID="$(hex2dec "$NOSTAIDRHX")" + NOSTAIDHX="\x$(awk '{$1=$1}1' FPAT='.{2}' OFS="\\\x" <<< "$NOSTAIDRHX")" + + if [ -f "$SCPATH" ]; then + #writelog "INFO" "${FUNCNAME[0]} - The file '$SCPATH' already exists, creating a backup, then removing the 2 closing backslashes at the end" + cp "$SCPATH" "${SCPATH//.vdf}_${PROGNAME}_backup.vdf" 2>/dev/null + truncate -s-2 "$SCPATH" + OLDSET="$(grep -aPo '\x00[0-9]\x00\x02appid' "$SCPATH" | tail -n1 | tr -dc '0-9')" + NEWSET=$((OLDSET + 1)) + #writelog "INFO" "${FUNCNAME[0]} - Last set in file has ID '$OLDSET', so continuing with '$OLDSET'" + else + #writelog "INFO" "${FUNCNAME[0]} - Creating new $SCPATH" + printf '\x00%s\x00' "shortcuts" > "$SCPATH" + NEWSET=0 + fi + + #writelog "INFO" "${FUNCNAME[0]} - Adding new set '$NEWSET'" + + { + printf '\x00%s\x00' "$NEWSET" + printf '\x02%s\x00%b' "appid" "$NOSTAIDHX" + printf '\x01%s\x00%s\x00' "appname" "$NOSTAPPNAME" + printf '\x01%s\x00%s\x00' "Exe" "$NOSTEXEPATH" + printf '\x01%s\x00%s\x00' "StartDir" "$NOSTSTDIR" + + if [ -n "$NOSTICONPATH" ]; then + printf '\x01%s\x00%s\x00' "icon" "$NOSTICONPATH" + else + printf '\x01%s\x00\x00' "icon" + fi + + printf '\x01%s\x00\x00' "ShortcutPath" + + if [ -n "$NOSTLAOP" ]; then + printf '\x01%s\x00%s\x00' "LaunchOptions" "$NOSTLAOP" + else + printf '\x01%s\x00\x00' "LaunchOptions" + fi + + if [ "$NOSTHIDE" -eq 1 ]; then + printf '\x02%s\x00\x01\x00\x00\x00' "IsHidden" + else + printf '\x02%s\x00\x00\x00\x00\x00' "IsHidden" + fi + + if [ "$NOSTADC" -eq 1 ]; then + printf '\x02%s\x00\x01\x00\x00\x00' "AllowDesktopConfig" + else + printf '\x02%s\x00\x00\x00\x00\x00' "AllowDesktopConfig" + fi + + if [ "$NOSTAO" -eq 1 ]; then + printf '\x02%s\x00\x01\x00\x00\x00' "AllowOverlay" + else + printf '\x02%s\x00\x00\x00\x00\x00' "AllowOverlay" + fi + + if [ "$NOSTVR" -eq 1 ]; then + printf '\x02%s\x00\x01\x00\x00\x00' "openvr" + else + printf '\x02%s\x00\x00\x00\x00\x00' "openvr" + fi + + # splitTags () { + # mapfile -d "," -t -O "${#TAGARR[@]}" TAGARR < <(printf '%s' "$1") + # for i in "${!TAGARR[@]}"; do + # if grep -q "${TAGARR[$i]}" <<< "$(getActiveSteamCollections)"; then + # printf '\x01%s\x00%s\x00' "$i" "${TAGARR[i]}" + # fi + # done + # } + + printf '\x02%s\x00\x00\x00\x00\x00' "Devkit" + printf '\x01%s\x00\x00' "DevkitGameID" + + printf '\x02%s\x00\x00\x00\x00\x00' "LastPlayTime" + printf '\x00%s\x00' "tags" + # splitTags "PortProton" + printf '\x08' + printf '\x08' + + #file end: + printf '\x08' + printf '\x08' + } >> "$SCPATH" +fi diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 505d3bd7..05c5b9e4 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -114,6 +114,22 @@ check_process () { } export -f check_process +try_download_game () { + [[ -f "${PW_AUTOINSTALL_EXE}" ]] && try_remove_file "${PW_AUTOINSTALL_EXE}" + PW_DOWNLOAD_FILE_NAME="$(basename $1)" + set -o pipefail + wget -O "$2" --read-timeout 300 --retry-connrefused --timeout 3 --tries 2 --no-dns-cache --no-cache \ + --user-agent="Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" "$1" 2>&1 | \ + tr '\r' '\n' | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9,.]\+.\) \(.*\)/\1\n#Downloading at \1\/, \2\/s, ETA \3/; s/^20[0-9][0-9].*/#Done./' | \ + zenity --progress --percentage=0 --title="Download ${PW_DOWNLOAD_FILE_NAME}" --text=Starting... --auto-close --width=500 --height=90 + if [ "${PIPESTATUS[0]}" != 0 ] ; then + print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME}." + return 1 + else + return 0 + fi +} + try_download () { PW_DOWNLOAD_FILE_NAME="$(basename $1)" set -o pipefail @@ -308,7 +324,7 @@ check_user_conf () { echo "# User overides db and var settings..." >> "${USER_CONF}" echo "# export DXVK_HUD=full" >> "${USER_CONF}" echo "# export GALLIUM_HUD=fps" >> "${USER_CONF}" - elif grep "optirun_on" "${USER_CONF}" ; then + elif grep "optirun_on" "${USER_CONF}" &>/dev/null ; then sed -i '/optirun_on/d' "${USER_CONF}" fi } @@ -370,11 +386,6 @@ init_wine_ver () { if [[ -d "${WINEDIR}" ]] ; then [[ ! -f "${WINEDIR}/version" ]] && echo "${PW_WINE_USE}" > "${WINEDIR}/version" - # if [[ -d "${WINEDIR}/lib32/" ]] ; then - # mv -f "${WINEDIR}/lib" "${WINEDIR}/lib64" - # mv -f "${WINEDIR}/lib32" "${WINEDIR}/lib" - # fi - if [[ ! -d "${WINEDIR}/lib64/" && -d "${WINEDIR}/lib/wine/x86_64-unix" ]] ; then create_new_dir "${WINEDIR}/lib64/wine" mv -f "${WINEDIR}/lib/wine/x86_64-unix" "${WINEDIR}/lib64/wine/" @@ -842,9 +853,8 @@ check_hybrid_graphicks () { } pw_init_db () { - if [[ ! -z "${portwine_exe}" ]] ; then - try_remove_file "${PORT_SCRIPTS_PATH}/portwine_db/setup" - export PORTWINE_DB=`echo "${portwine_exe}" | awk -F '/' 'NF>1{print $NF}' | sed s/".exe"/""/gi` + if [[ -f "${portwine_exe}" ]] ; then + export PORTWINE_DB="$(basename "${portwine_exe}" .exe)" if [[ -f "${portwine_exe}".ppdb ]] && [[ "${PORTWINE_DB}" != "RiotClientServices" ]] ; then export PORTWINE_DB_FILE="${portwine_exe}".ppdb . "${PORTWINE_DB_FILE}" @@ -855,7 +865,12 @@ pw_init_db () { else orig_IFS="$IFS" IFS=$'\n' - PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` + if [[ "$START_FROM_STEAM" != 1 ]] ; then + PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi` + else + # BpeMeHHblu` KocTblJlb =) + PW_FIND_DB_FILE=`grep -ilw "#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/* | sed s/".exe"/""/gi | head -n 1` + fi if [[ `echo "$PW_FIND_DB_FILE" | wc -l` -gt 1 ]] ; then unset ADD_CB_DBFILE for PW_CHECK_DB_FILE in $PW_FIND_DB_FILE ; do @@ -884,16 +899,13 @@ pw_init_db () { edit_db_from_gui PW_PREFIX_NAME fi fi - if [ ! -z "${PORTWINE_DB_FILE}" ]; then + if [[ -f "${PORTWINE_DB_FILE}" ]] ; then . "${PORTWINE_DB_FILE}" - # HOTFIX: update prefix - [[ "$PW_WINE_USE" == "PROTON_LG_8-15" ]] && export PW_WINE_USE="$PW_PROTON_LG_VER" - - init_wine_ver && + init_wine_ver && print_info "Use ${PORTWINE_DB_FILE} db file." fi - if [ -z "${PATH_TO_GAME}" ] ; then + if [[ -d "${PATH_TO_GAME}" ]] ; then export PATH_TO_GAME="$( cd "$( dirname "${portwine_exe}" )" >/dev/null 2>&1 && pwd )" fi @@ -1043,6 +1055,22 @@ edit_db_from_gui () { return 0 } +edit_user_conf_from_gui () { + for mod_db in $@ ; do + print_info "${mod_db}=${!mod_db}" + if [ -z "`cat "${USER_CONF}" | grep "export ${mod_db}="`" ] ; then + echo "export ${mod_db}=\"${!mod_db}\"" >> "${USER_CONF}" + elif [ "`cat "${USER_CONF}" | grep "export ${mod_db}=" | grep -v "#"`" ] ; then + if [ "`cat "${USER_CONF}" | grep "export ${mod_db}=" | grep -v "#"`" != "export ${mod_db}=\"${!mod_db}\"" ] ; then + sed -ri "s/^export ${mod_db}=.*/export ${mod_db}=\"${!mod_db}\"/" "${USER_CONF}" + fi + elif [ "`cat "${USER_CONF}" | grep "export ${mod_db}="`" != "export ${mod_db}=${!mod_db}" ] ; then + sed -ri "s/.*export ${mod_db}=.*/export ${mod_db}=\"${!mod_db}\"/g" "${USER_CONF}" + fi + done + return 0 +} + pw_create_gui_png () { if [ ! -z "${PORTWINE_CREATE_SHORTCUT_NAME}" ] ; then export PORTPROTON_NAME="${PORTWINE_CREATE_SHORTCUT_NAME}" diff --git a/data_from_portwine/scripts/lang b/data_from_portwine/scripts/lang index 51be6045..92e5bc95 100755 --- a/data_from_portwine/scripts/lang +++ b/data_from_portwine/scripts/lang @@ -61,6 +61,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then export sc_info="Ярлык будет создан в каталоге ${portname}." export sc_name="Название" export sc_menu_desktop="Добавить ярлык в МЕНЮ -> Игры и на Рабочий стол" + export sc_add_in_steam="Добавить ярлык в библиотеку STEAM" + export sc_restert_steam="Для добавления ярлыка в STEAM, необходим перезапуск.\n\nПерезапустить STEAM?" export inst_succ="Установка завершена успешно!" @@ -267,8 +269,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then export loc_gui_amd_vulkan_select="Изменить используемый драйвер vulkan для AMD" export loc_gui_amd_vulkan_select_help="Выбор какая реализация vulkan будет использоваться для запуска игры" - export loc_gui_gpu_select="Выбрать видеокарту для запуска игры" - export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры" + export loc_gui_gpu_select="Выбрать видеокарту для запуска игры (в user.conf)" + export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры (используется для всех запускаемых игр и программ в PortProton)" export loc_gui_check_new_wine="Проверяем новые версии WINE на GitHub" export loc_gui_check_new_wine_error="Не удается установить соединение с GitHub\nдля проверки новых версии WINE." @@ -343,6 +345,8 @@ elif [[ "${update_loc}" == "ENG" ]] ; then export sc_info="The shortcut will be created in the ${portname} directory." export sc_name="Name" export sc_menu_desktop="Add shortcut to MENU -> GAMES and Desktop" + export sc_add_in_steam="Add shortcut to STEAM library" + export sc_restert_steam="For adding shortcut to STEAM, needed restart.\n\nRestart STEAM now?" export inst_succ="The installation was successful." diff --git a/data_from_portwine/scripts/portwine_db/MWO b/data_from_portwine/scripts/portwine_db/MWO index f94f65cc..1b6a33d5 100644 --- a/data_from_portwine/scripts/portwine_db/MWO +++ b/data_from_portwine/scripts/portwine_db/MWO @@ -6,10 +6,10 @@ #####################examples########################### if [ "${update_loc}" = "RUS" ] ; then - export PW_COMMENT_DB="На данный момент игра работает, но долго запускаеться из Лаунчера. После установки игры, при повторном запуске, игра будет запускаться быстро." + export PW_COMMENT_DB="На данный момент игра работает, но долго запускаеться из Лаунчера.\nПосле установки игры, при повторном запуске, игра будет запускаться быстро." fi if [ "${update_loc}" = "ENG" ] ; then - export PW_COMMENT_DB="At the moment the game works, but it takes a long time to start from the Launcher. After installing the game, when restarting, the game will start quickly." + export PW_COMMENT_DB="At the moment the game works, but it takes a long time to start from the Launcher.\nAfter installing the game, when restarting, the game will start quickly." fi add_in_start_portwine () diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA b/data_from_portwine/scripts/pw_autoinstall/PW_ANKAMA index ea31c45d..aa1a2d16 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 "https://download.ankama.com/launcher/full/win/" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 b2d027b8..b3a76c96 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -4,7 +4,7 @@ [ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" start_portwine -if try_download "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 c75f07e2..8da0d7d5 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 "https://download.cdp.bethesda.net/BethesdaNetLauncher_Setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 7f78e5ac..68c9e41b 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 "https://battleofspaceraiders.com/install/bsr_setup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 82200e68..9120e1f2 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CALIBER @@ -9,7 +9,7 @@ export PW_WINE_USE=PROTON_STEAM_6.3-8 gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download "https://caliber-files.gcdn.co/caliber-s3/p1/a88c3b70f76a0e56b1e08b62c9895cfe/launcher/setup/CaliberSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 b6bb78d2..6293640e 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 "${PW_URL_CEMU}" "${PW_AUTOINSTALL_EXE}" +if try_download_game "${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 f7956132..dc11bd66 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CITRA +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CITRA @@ -4,7 +4,7 @@ #export LAUNCH_PARAMETERS=("") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/citra-setup-windows.exe" start_portwine -if try_download "github.com/citra-emu/citra-web/releases/download/1.0/citra-setup-windows.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 35160e60..bb94ffff 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_CROSSOUT @@ -6,7 +6,7 @@ export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/crossout.exe" # export PW_PREFIX_NAME=DOTNET start_portwine -if try_download "https://yupmaster.gaijinent.com/launcher/current.php?id=CrossoutLauncher" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 bae0986b..f52b2237 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 "https://cdn-01.contractwarsgame.com/standalone/CWClient_Install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 abaa6afc..36b0071d 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 "http://demul.emulation64.com/files/demul07_280418.7z" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 290849b7..900433ba 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 "https://dl-mirror.dolphin-emu.org/5.0/dolphin-x64-5.0.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 a2fdb81f..db96ffef 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 "https://github.com/stenzek/duckstation/releases/download/preview/duckstation-windows-x64-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 5277aad2..776cd1f5 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="EA_APP" # gui_proton_downloader silent "WINE-8.8-STAGING-TKG-AMD64" start_portwine -if try_download "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " pw_kill_autostart EABackgroundService.exe & diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC index 1cb8aa09..82f119cc 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EPIC +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EPIC @@ -8,7 +8,7 @@ export PW_USE_D3D_EXTRAS=1 try_remove_file "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" start_portwine -if try_download "https://launcher-public-service-prod06.ol.epicgames.com/launcher/api/installer/download/EpicGamesLauncherInstaller.msi" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 788dca7e..0582f014 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 "https://www.epsxe.com/files/ePSXe205.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 e88b8625..651aac40 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EVE +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EVE @@ -5,7 +5,7 @@ export PW_WINDOWS_VER=10 export PW_DLL_INSTALL="vcrun2017" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EveLauncher-2198233.exe" start_portwine -if try_download "https://binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://binaries.eveonline.com/EveLauncher-2198233.exe" "${PW_AUTOINSTALL_EXE}" then pw_kill_autostart evelauncher.exe & pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX index 61363e8c..272391a5 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX +++ b/data_from_portwine/scripts/pw_autoinstall/PW_FCEUX @@ -3,7 +3,7 @@ ######################################################################## export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/fceux-2.6.5-win64.zip" start_portwine -if try_download "https://github.com/TASEmulators/fceux/releases/download/v2.6.6/fceux-2.6.6-win64.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 6cc0f734..e1830529 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 "https://raw.githubusercontent.com/WarfaceZ/lutris-clients/master/GameforgeInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 403a512f..819d4104 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GENSHIN_IMPACT @@ -7,7 +7,7 @@ export PW_PREFIX_NAME="GENSHIN_IMPACT" start_portwine -if try_download "https://ys-api-os.mihoyo.com/event/download_porter/link/ys_global/genshinimpactpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 0e33b1a4..d3af8b24 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 "https://glyph.dyn.triongames.com/glyph/live/GlyphInstall.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 9de702fd..fe471eab 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" start_portwine -if try_download "https://webinstallers.gog-statics.com/download/GOG_Galaxy_2.0.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://webinstallers.gog-statics.com/download/GOG_Galaxy_2.0.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} GOG Galaxy. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" 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 313f58d4..7fab05dc 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 "https://s3.amazonaws.com/gw2cdn/client/branches/Gw2Setup-64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 0591d493..e6a92d9d 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 "https://content.indiegalacdn.com/common/IGClientSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 b4ef4f95..2ae14fce 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 "https://itch.io/app/download?platform=windows" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 db778f92..793e7da6 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 "https://redirect.lesta.ru/LGC/Lesta_Game_Center_Install_RU.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 e27e35ae..a512ed3b 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_LOL +++ b/data_from_portwine/scripts/pw_autoinstall/PW_LOL @@ -14,7 +14,7 @@ export DISABLE_CP_DEFPFX=1 gui_proton_downloader silent "${PW_WINE_USE}" start_portwine -if try_download "https://lol.secure.dyn.riotcdn.net/channels/public/x/installer/current/live.na.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 be6a81e6..73569e43 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 "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://github.com/mamedev/mame/releases/download/mame0259/mame0259b_64bit.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} MAME. ${loc_gui_please_wait} " "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Mame" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_MWO b/data_from_portwine/scripts/pw_autoinstall/PW_MWO index bf42113c..e2886baa 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_MWO +++ b/data_from_portwine/scripts/pw_autoinstall/PW_MWO @@ -4,11 +4,15 @@ export LAUNCH_PARAMETERS=("/s" "/nr" "/l=Russian") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/MWO_Launcher_Setup.exe" start_portwine -if try_download "http://mwogame.com/download.php" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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}" - portwine_exe="$WINEPREFIX/drive_c/Games/MetalWarOnline/MWOLauncher.exe" + if [[ -d "$WINEPREFIX/drive_c/games/" ]] ; then + portwine_exe="$WINEPREFIX/drive_c/games/MetalWarOnline/MWOLauncher.exe" + else + portwine_exe="$WINEPREFIX/drive_c/Games/MetalWarOnline/MWOLauncher.exe" + fi try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${portwine_exe}.ppdb" kill_portwine diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN b/data_from_portwine/scripts/pw_autoinstall/PW_ORIGIN index 08fbfc5e..f97f8d5d 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 "https://origin-a.akamaihd.net/Origin-Client-Download/origin/live/OriginThinSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 1132e00d..afa5a68d 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_OSU +++ b/data_from_portwine/scripts/pw_autoinstall/PW_OSU @@ -6,7 +6,7 @@ start_portwine #export PW_DLL_INSTALL="dotnet48" mkdir -p "${WINEPREFIX}/drive_c/Program Files (x86)/OSU/" export PW_AUTOINSTALL_EXE="${WINEPREFIX}/drive_c/Program Files (x86)/OSU/osu!.exe" -if try_download "https://m1.ppy.sh/r/osu!install.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 fa6050c1..b4690ec6 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PANZAR @@ -7,7 +7,7 @@ export PW_PREFIX_NAME="PANZAR" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Panzar.exe" start_portwine -if try_download "https://www.panzar.ru/ru/download/installer/" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 2fd95841..28cc89e4 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 "https://plarium.com/services/api/downloads/desktop?lid=1&arc=64&os=windows" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 7d1b8c04..e76e6cec 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 "https://web.poecdn.com/protected/downloads/PathOfExileInstaller.exe?key=lpKVe-ZJOqVrur8612s8gg" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 17ed6062..47f8fdf4 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 "https://ppsspp.org/files/1_16_5/PPSSPPSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 4a54843c..e8ddb2d3 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 +++ b/data_from_portwine/scripts/pw_autoinstall/PW_PROJECT64 @@ -4,7 +4,7 @@ export LAUNCH_PARAMETERS=("/VERYSILENT") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Setup Project64 3.0.1-5664-2df3434.exe" start_portwine -if try_download "https://pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://pj64-emu.com/file/setup-project64-3-0-0-5632-f83bee9/" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} Project64. ${loc_gui_please_wait} " pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH b/data_from_portwine/scripts/pw_autoinstall/PW_RETROARCH index fac2ec77..2f15206e 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 "https://buildbot.libretro.com/stable/1.16.0/windows/x86_64/RetroArch.7z" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 b51e13cb..e0c5ac7d 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="" start_portwine -if try_download "https://setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "https://setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" then pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$(find "$WINEPREFIX/drive_c/Program Files (x86)/Roblox/" -type f -name "RobloxPlayerBeta.exe" | head -n 1)" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR index 526cb20e..eea63d63 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROCKSTAR @@ -4,7 +4,7 @@ export PW_VULKAN_USE="1" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Rockstar-Games-Launcher.exe" start_portwine -if try_download "https://gamedownloads.rockstargames.com/public/installer/Rockstar-Games-Launcher.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 5e46c088..bf9e1957 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 "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_game "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 c1b31c7e..5fe90137 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 "https://downloads.scummvm.org/frs/scummvm/2.7.1/scummvm-2.7.1-win32.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 602da399..679b8e04 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 "https://update-nl-release.stalker.so/launcher/SO_installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 5a60c64f..41038cf0 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 "https://exbo2.b-cdn.net/EXBO_Setup_ru.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 62319533..13c8d999 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 "https://sg-public-api.hoyoverse.com/event/download_porter/link/hkrpg_global/oswebpc/default" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 d5d981df..6a3e87af 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 "https://cdn.cloudflare.steamstatic.com/client/installer/SteamSetup.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 1c15754a..26104719 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 "https://web-cdn.funcom.com/downloads/swl/SecretWorldLegendsMin.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 98ba8024..2d012dc8 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 "https://ubistatic3-a.akamaihd.net/orbit/launcher_installer/UbisoftConnectInstaller.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 b588b496..8661a3f3 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 "https://github.com/visualboyadvance-m/visualboyadvance-m/releases/latest/download/visualboyadvance-m-Win-x86_64.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 47a8af85..48862174 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 "https://static.gc.my.games/VKPlayLoader.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 35d0e16c..4d5761a1 100644 --- a/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME +++ b/data_from_portwine/scripts/pw_autoinstall/PW_WARFRAME @@ -5,12 +5,16 @@ export LAUNCH_PARAMETERS=("/q") export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Warframe.msi" start_portwine -if try_download "http://content.warframe.com/dl/Warframe.msi" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 & pw_run msiexec /i "${PW_AUTOINSTALL_EXE}" - portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Warframe/Downloaded/Public/Tools/Launcher.exe" + + pushd "${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Warframe/Downloaded/Public/Tools/" + ln -s Launcher.exe Warframe_Launcher.exe + popd + portwine_exe="${WINEPREFIX}/drive_c/users/$USER/AppData/Local/Warframe/Downloaded/Public/Tools/Warframe_Launcher.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_WGC b/data_from_portwine/scripts/pw_autoinstall/PW_WGC index 4038fc9f..664a8bd7 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 "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 c6cc477b..6f53c110 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" || zenity_error "Error while get version of WOSB INSTALLER." start_portwine -if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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} " diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_XEMU b/data_from_portwine/scripts/pw_autoinstall/PW_XEMU index 9ed7306d..e1e2de43 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 "https://github.com/xemu-project/xemu/releases/latest/download/xemu-win-release.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 d90e2b27..844d5197 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 "https://github.com/xenia-project/release-builds-windows/releases/latest/download/xenia_master.zip" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 3371acf9..921a9f5b 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 "https://download.tuxfamily.org/yabause/releases/0.9.15/yabause-0.9.15-win64.exe" "${PW_AUTOINSTALL_EXE}" +if try_download_game "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 66a3981f..38a4b702 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -1,6 +1,6 @@ #!/usr/bin/env bash # Author: Castro-Fidel (linux-gaming.ru) -# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138 +# Development assistants: Cefeiko; Dezert1r; Taz_mania; Anton_Famillianov; gavr; RidBowt; chal55rus; UserDiscord; Boria138; Vano; Akai ######################################################################## echo ' █░░ █ █▄░█ █░█ ▀▄▀ ▄▄ █▀▀ ▄▀█ █▀▄▀█ █ █▄░█ █▀▀ ░ █▀█ █░█ @@ -186,6 +186,41 @@ start_portwine () { export DXVK_ENABLE_NVAPI=1 fi + if [[ "${PW_GPU_USE}" != "disabled" ]] ; then + export DXVK_FILTER_DEVICE_NAME="${PW_GPU_USE}" + export VKD3D_FILTER_DEVICE_NAME="${PW_GPU_USE}" + fi + + # if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then + # export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + # if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then + # export VK_ICD_FILENAMES="/opt/amdgpu/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu/etc/vulkan/icd.d/amd_icd64.json" + # elif grep -i -q "altlinux" '/etc/os-release' ; then + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd.json" + # else + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd32.json:/usr/share/vulkan/icd.d/amd_icd64.json" + # fi + # elif [[ "${PW_AMD_VULKAN_USE}" == "amdgpupro" ]] ; then + # export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + # if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then + # export VK_ICD_FILENAMES="/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json" + # var_ld_library_path_update "/opt/amdgpu/libdrm/lib64:/opt/amdgpu/libdrm/lib32" + # else + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_pro_icd32.json:/usr/share/vulkan/icd.d/amd_pro_icd64.json" + # fi + # elif [[ "${PW_AMD_VULKAN_USE}" == "radv" ]] ; then + # export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" + # elif [[ "${PW_AMD_VULKAN_USE}" == "radv_aco" ]] ; then + # export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + # var_radv_perftest_config_update aco + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" + # elif [[ "${PW_AMD_VULKAN_USE}" == "radv_gpl" ]] ; then + # export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 + # var_radv_perftest_config_update gpl + # export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" + # fi + case "$PW_FORCE_USE_VSYNC" in # 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT "0") unset vblank_mode @@ -202,10 +237,6 @@ start_portwine () { if [[ -x "`command -v "gamemoderun" 2>/dev/null`" ]] && [[ "$PW_USE_GAMEMODE" = "1" ]] ; then export GAMEMODERUN=1 PW_GAMEMODERUN_SLR="gamemoderun" - # if [[ ! -z "${PW_LD_PRELOAD}" ]] - # then export PW_LD_PRELOAD="${PW_LD_PRELOAD}:${MANGOHUD_LIB_NAME}" - # else export PW_LD_PRELOAD="${MANGOHUD_LIB_NAME}" - # fi systemctl enable --now --user gamemoded &>/dev/null print_info "Gamemod will be launched." else @@ -263,7 +294,7 @@ start_portwine () { fi fi - [[ "${START_FROM_STEAM}" != 1 ]] || pw_update_pfx_cover_gui + pw_update_pfx_cover_gui if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}" \ || ! -d "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}"/drive_c/windows \ @@ -589,15 +620,11 @@ start_portwine () { echo "Disable EAC" [[ -z "${LAUNCH_PARAMETERS}" ]] && export LAUNCH_PARAMETERS+=" -eac-nop-loaded " fi - + pw_stop_progress_bar && + [[ "${START_FROM_STEAM}" != 1 ]] && pw_tray_icon sleep 0.5 - if [[ "${START_FROM_STEAM}" != 1 ]] ; then - pw_stop_progress_bar && - pw_tray_icon && - - if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] && [[ "${START_FROM_STEAM}" != 1 ]] ; then - pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" - fi + if [[ "${PW_CHECK_AUTOINSTAL}" != "1" ]] ; then + pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" fi add_in_start_portwine @@ -618,6 +645,7 @@ pw_run () { PW_LOG_TO_FILE="${PORT_WINE_PATH}/${portname}.log" print_var "WINEDIR" "WINEPREFIX" "WINEDLLOVERRIDES" "PATH_TO_GAME" "PW_WINE_USE" "PW_VULKAN_USE" "VKD3D_CONFIG" \ "PW_LD_LIBRARY_PATH" "PATH" "WINEESYNC" "WINEFSYNC" "WINEFSYNC_FUTEX2" "WINEDLLPATH" "WINE_CPU_TOPOLOGY" + kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" &>/dev/null if [[ "${PW_LOG}" == 1 ]] ; then echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" @@ -625,7 +653,7 @@ pw_run () { echo "" print_debug "Log from RUNTIME and WINE:" ${PW_GAMEMODERUN_SLR} \ - NO_AT_BRIDGE=0 ${pw_runtime} \ + ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ @@ -641,7 +669,7 @@ pw_run () { echo "" print_debug "Log from RUNTIME and WINE:" ${PW_GAMEMODERUN_SLR} \ - NO_AT_BRIDGE=0 ${pw_runtime} \ + ${pw_runtime} \ env ${PW_MANGOHUD_SLR} \ PATH="${PATH}" \ LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ @@ -714,9 +742,8 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN" create_new_dir "${PW_VULKAN_DIR}" -# TODO: for steam -# export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts" -# create_new_dir "${STEAM_SCRIPTS}" +export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts" +create_new_dir "${STEAM_SCRIPTS}" export VULKAN_API_DRIVER_VERSION="$(vulkaninfo 2>/dev/null | grep "api" | head -n 1 | awk '{print $3}')" export LSPCI_VGA="$(lspci -k | grep -E 'VGA|3D' | tr -d '\n')" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 9e0efab8..67c79793 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash # Author: linux-gaming.ru - [[ "${START_FROM_STEAM}" == 1 ]] || export NO_AT_BRIDGE=1 +export NO_AT_BRIDGE=1 export pw_full_command_line=("$0" $*) MISSING_DESKTOP_FILE=0 @@ -604,8 +604,8 @@ else fi unset PW_GUI_DISABLED_CS fi -if [ ! -z "${portwine_exe}" ]; then - if [[ -z "${PW_GUI_DISABLED_CS}" || "${PW_GUI_DISABLED_CS}" == 0 ]] ; then +if [[ -f "${portwine_exe}" ]] ; then + if [[ "${PW_GUI_DISABLED_CS}" != 1 ]] ; then pw_create_gui_png grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop if [[ "$?" != "0" ]] ; then @@ -635,7 +635,7 @@ if [ ! -z "${portwine_exe}" ]; then else export PW_PREFIX_NAME="${PW_PREFIX_NAME^^}" fi - elif [ ! -z "${PORTWINE_DB_FILE}" ]; then + elif [[ -f "${PORTWINE_DB_FILE}" ]] ; then portwine_launch fi else @@ -888,7 +888,7 @@ esac init_wine_ver -if [[ -z "${PW_DISABLED_CREATE_DB}" ]] ; then +if [[ "${PW_DISABLED_CREATE_DB}" != 1 ]] ; then if [[ ! -z "${PORTWINE_DB}" ]] && [[ -z "${PORTWINE_DB_FILE}" ]] ; then PORTWINE_DB_FILE=$(grep -il "\#${PORTWINE_DB}.exe" "${PORT_SCRIPTS_PATH}/portwine_db"/*) if [[ -z "${PORTWINE_DB_FILE}" ]] ; then diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 4847e5f5..8f90cd26 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=2231 +#SCRIPTS_NEXT_VERSION=2232 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt @@ -31,6 +31,7 @@ export PW_FORCE_LARGE_ADDRESS_AWARE="1" export PW_MANGOHUD_x32="0" export PW_USE_EAC_AND_BE="1" export PW_USE_US_LAYOUT="0" +export PW_GPU_USE="disabled" ###GTK_CONFIG### # export GTK_DATA_PREFIX= # export GTK_THEME="Adwaita:dark" diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 1f1465e8..1b183880 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -31,7 +31,6 @@ gui_question () { [ $? -eq "0" ] && return 0 || return 1 } - pw_start_progress_bar_cover () { PW_GIF_FILE="$1" PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 20}'` @@ -48,7 +47,7 @@ pw_update_pfx_cover_gui () { PW_GIF_SIZE_X=`file "${PW_GIF_FILE}" | awk '{print $7 + 40}'` PW_GIF_SIZE_Y=`file "${PW_GIF_FILE}" | awk '{print $9 + 80}'` echo "UPDATE PREFIX..." > "${PORT_WINE_TMP_PATH}/update_pfx_log" - unset PW_TIMER + export PW_TIMER=0 while read -r line || [[ ! -z `pgrep -a yad | grep "yad_v12_3 --notebook --key="$PW_KEY_PROGRESS_BAR"" | awk '{print $1}'` ]] ; do sleep 0.005 if [[ ! -z "${line}" ]] && [[ -z "`echo "${line}" | grep -i "gstreamer"`" ]] \ @@ -159,11 +158,11 @@ pw_gui_for_edit_db () { else CPU_LIMIT_VAR="disabled" fi - if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "disabled" ]] ; then - AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}" - else - AMD_VULKAN_VAR="disabled" - fi + # if [[ ! -z "${PW_AMD_VULKAN_USE}" ]] && [[ "${PW_AMD_VULKAN_USE}" != "disabled" ]] ; then + # AMD_VULKAN_VAR="${PW_AMD_VULKAN_USE}" + # else + # AMD_VULKAN_VAR="disabled" + # fi if [[ ! -z "${PW_GPU_USE}" ]] && [[ "${PW_GPU_USE}" != "disabled" ]] ; then GPU_VAR="${PW_GPU_USE}" @@ -171,7 +170,7 @@ pw_gui_for_edit_db () { GPU_VAR="disabled" fi - GET_GPU_NAMES=$(vulkaninfo 2>/dev/null | awk -F '=' '/deviceName/{print $2}' | paste -sd '!' | sed 's/^ //') + GET_GPU_NAMES=$(vulkaninfo 2>/dev/null | awk -F '=' '/deviceName/{print $2}' | sed '/llvm/d'| sort -u | sed 's/^ //' | paste -sd '!') GET_REFRASH_RATE="30!45!60!75!120!144!165!240" @@ -206,6 +205,9 @@ pw_gui_for_edit_db () { "XP") ADD_WINVER_EDIT_DB="XP!7!10" ;; *) ADD_WINVER_EDIT_DB="10!7!XP" ;; esac + + # --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!disabled!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" + "${pw_yad_v12_3}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator="%" --columns=1 \ --field="${loc_gui_ver_windows}!${loc_gui_ver_windows_help} :CB" "${ADD_WINVER_EDIT_DB}" \ --field="${loc_gui_aut_winetricks}!${loc_gui_aut_winetricks_help} :CBE" "${PW_DLL_INSTALL}!vcrun2019 corefonts lucida" \ @@ -214,10 +216,9 @@ pw_gui_for_edit_db () { --field="${loc_gui_arg_exe}!${loc_gui_arg_exe_help} :CBE" "\\${LAUNCH_PARAMETERS[@]}!-dx11 -skipintro 1" \ --field=":LBL" "" \ --field="${loc_gui_cpu_limit}!${loc_gui_cpu_limit_help} :CB" "${CPU_LIMIT_VAR}!disabled!${GET_LOGICAL_CORE}" \ - --field="${loc_gui_amd_vulkan_select}!${loc_gui_amd_vulkan_select_help} :CB" "${AMD_VULKAN_VAR}!disabled!amdvlk!amdgpupro!radv!radv_gpl!radv_aco" \ --field="${loc_gui_gpu_select}!${loc_gui_gpu_select_help} :CB" "${GPU_VAR}!disabled!${GET_GPU_NAMES}" \ --field="${loc_gui_mango_fps}!${loc_gui_mango_fps_help} :CB" "${FPS_LIMIT_VAR}!disabled!${GET_REFRASH_RATE}" 2>/dev/null 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" 2>/dev/null & - "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="700" \ + "${pw_yad_v12_3}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="750" \ --text "${loc_gui_edit_db} ${PORTWINE_DB}\n ${loc_gui_edit_db_help}" --separator=" " --borders=3 \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" \ --button="${loc_gui_cancel}"!!"${loc_gui_cancel_help}":1 \ @@ -247,9 +248,9 @@ pw_gui_for_edit_db () { WINEDLLOVERRIDES=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $3}'` LAUNCH_PARAMETERS=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $5}'` CPU_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $7}'`" - PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`" - PW_GPU_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`" - FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $10}'`" + PW_GPU_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $8}'`" + FPS_LIMIT="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`" + # PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $10}'`" if [[ "${FPS_LIMIT}" != "disabled" ]] && [[ "${FPS_LIMIT_VAR}" != "disabled" ]] ; then export MANGOHUD_CONFIG="$(echo ${MANGOHUD_CONFIG} | sed "s/fps_limit=${FPS_LIMIT_VAR}/fps_limit=${FPS_LIMIT}/")" @@ -265,41 +266,10 @@ pw_gui_for_edit_db () { else export PW_WINE_CPU_TOPOLOGY="disabled" fi - if [[ "${PW_AMD_VULKAN_USE}" == "amdvlk" ]] ; then - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then - export VK_ICD_FILENAMES="/opt/amdgpu/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu/etc/vulkan/icd.d/amd_icd64.json" - elif grep -i -q "altlinux" '/etc/os-release' ; then - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd.json" - else - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_icd32.json:/usr/share/vulkan/icd.d/amd_icd64.json" - fi - elif [[ "${PW_AMD_VULKAN_USE}" == "amdgpupro" ]] ; then - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - if grep -i -q -E '(rosa|redos|nobara|linuxmint|ubuntu|centos|rhel|fedora)' "/etc/os-release" ; then - export VK_ICD_FILENAMES="/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd32.json:/opt/amdgpu-pro/etc/vulkan/icd.d/amd_icd64.json" - var_ld_library_path_update "/opt/amdgpu/libdrm/lib64:/opt/amdgpu/libdrm/lib32" - else - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/amd_pro_icd32.json:/usr/share/vulkan/icd.d/amd_pro_icd64.json" - fi - elif [[ "${PW_AMD_VULKAN_USE}" == "radv" ]] ; then - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" - elif [[ "${PW_AMD_VULKAN_USE}" == "radv_aco" ]] ; then - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - var_radv_perftest_config_update aco - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" - elif [[ "${PW_AMD_VULKAN_USE}" == "radv_gpl" ]] ; then - export DISABLE_LAYER_AMD_SWITCHABLE_GRAPHICS_1=1 - var_radv_perftest_config_update gpl - export VK_ICD_FILENAMES="/usr/share/vulkan/icd.d/radeon_icd.i686.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json" - fi - if [[ "${PW_GPU_USE}" != "disabled" ]]; then - export DXVK_FILTER_DEVICE_NAME=$PW_GPU_USE - export VKD3D_FILTER_DEVICE_NAME=$PW_GPU_USE - fi echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE" - edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY PW_AMD_VULKAN_USE PW_GPU_USE + edit_db_from_gui $@ MANGOHUD_CONFIG LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY + edit_user_conf_from_gui PW_GPU_USE + # PW_AMD_VULKAN_USE return 0 } @@ -536,22 +506,27 @@ gui_vkBasalt () { portwine_create_shortcut () { pw_create_gui_png + pw_stop_progress_bar + if ls "$HOME/.local/share/Steam/userdata/"*"/config/shortcuts.vdf" &>/dev/null + then PW_FOUND_VDF=TRUE + else PW_FOUND_VDF=FALSE + fi export name_desktop="${PORTPROTON_NAME}" OUTPUT=$("${pw_yad}" --title="${inst_set}." --form --borders=3 \ --window-icon "$PW_GUI_ICON_PATH/port_proton.png" \ --image "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" \ --field="${sc_info}":LBL "" \ --field="${sc_name}:" "${name_desktop}" \ - --field="${sc_menu_desktop}":CHK "TRUE" \ + --field=" ${sc_menu_desktop}":CHK "TRUE" \ + --field=" ${sc_add_in_steam}":CHK "$PW_FOUND_VDF" \ --button="$loc_gui_create_shortcut":0) if [ $? -eq "0" ]; then - name_desktop=$(echo "$OUTPUT" | awk -F'|' '{ print $2 }') - create_menu_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{ print $3 }') + name_desktop=$(echo "$OUTPUT" | awk -F'|' '{print $2}') + create_menu_desktop_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $3}') + create_menu_steam_shortcut=$(echo "$OUTPUT" | awk -F'|' '{print $4}') try_remove_file "${PORT_WINE_PATH}/${name_desktop}.desktop" - mv -f "${PORT_WINE_PATH}/data/img/${PORTPROTON_NAME}.png" "${PORT_WINE_PATH}/data/img/${name_desktop}.png" - echo "[Desktop Entry]" > "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Name=${name_desktop}" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" echo "Exec=env "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" "" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" @@ -562,14 +537,6 @@ portwine_create_shortcut () { echo "Icon="${PORT_WINE_PATH}/data/img/${name_desktop}.png"" >> "${PORT_WINE_PATH}/${name_desktop}.desktop" chmod u+x "${PORT_WINE_PATH}/${name_desktop}.desktop" - # TODO: for steam - # echo "#!/usr/bin/env bash" > "${STEAM_SCRIPTS}/${name_desktop}.sh" - # echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh" - # echo "export LD_PRELOAD=\"\"" >> "${STEAM_SCRIPTS}/${name_desktop}.sh" - # echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh" - # chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh" - # "${PORT_SCRIPTS_PATH}/add_in_steam.sh" - if [[ "${create_menu_desktop_shortcut}" == "TRUE" ]]; then try_remove_file "${HOME}/.local/share/applications/${name_desktop}.desktop" cp -f "${PORT_WINE_PATH}/${name_desktop}.desktop" "${HOME}/.local/share/applications/" @@ -580,6 +547,27 @@ portwine_create_shortcut () { fi fi + if [[ "${PW_FOUND_VDF}" == "TRUE" ]] && [[ "${create_menu_steam_shortcut}" == "TRUE" ]] ; then + echo "#!/usr/bin/env bash" > "${STEAM_SCRIPTS}/${name_desktop}.sh" + echo "export START_FROM_STEAM=1" >> "${STEAM_SCRIPTS}/${name_desktop}.sh" + echo "export LD_PRELOAD=" >> "${STEAM_SCRIPTS}/${name_desktop}.sh" + echo "\"${PORT_SCRIPTS_PATH}/start.sh\" \"${portwine_exe}\" " >> "${STEAM_SCRIPTS}/${name_desktop}.sh" + chmod u+x "${STEAM_SCRIPTS}/${name_desktop}.sh" + "${PORT_SCRIPTS_PATH}/add_in_steam.sh" + if pgrep -i steam &>/dev/null ; then + if gui_question "$sc_restert_steam" ; then + pw_start_progress_bar_block "Restarting STEAM... Please wait." + kill -s SIGTERM $(pgrep -a steam) &>/dev/null + while pgrep -i steam &>/dev/null ; do + sleep 0.5 + done + steam & + sleep 5 + pw_stop_progress_bar + exit 0 + fi + fi + fi [[ "$1" != silent ]] && xdg-open "${PORT_WINE_PATH}" 2>1 >/dev/null & fi @@ -588,7 +576,7 @@ portwine_create_shortcut () { portwine_delete_shortcut () { rm -f "$(grep -il "${portwine_exe}" "${HOME}/.local/share/applications"/*.desktop)" $>/dev/null rm -f "$(grep -il "${portwine_exe}" "${PORT_WINE_PATH}"/*.desktop)" $>/dev/null - rm -f "$(grep -il "${portwine_exe}" "${STEAM_SCRIPTS}"/*.sh)" $>/dev/null + # rm -f "$(grep -il "${portwine_exe}" "${STEAM_SCRIPTS}"/*.sh)" $>/dev/null if [[ -d "${HOME}/Desktop" ]] ; then rm -f "$(grep -il "${portwine_exe}" "${HOME}/Desktop"/*.desktop)" $>/dev/null elif [[ -d "${HOME}/Рабочий стол" ]] ; then