fixed get ppdb for symlink

data_from_portwine/changelog_ru

@@ -2,12 +2,15 @@
 -----------------------------------------
 История изменений:
 
-; * обновлен PROTON_LG до версии "9-15"
+* обновлен PROTON_LG до версии "9-15"
 * обновлены версии:
     * DXVK_GIT "2.4.1-74"
     * VKD3D_GIT "1.1-4202"
-* добавлена автоустановка игры "Star Conflict" (спасибо Chal55rus)
+* добавлена автоустановка "Star Conflict" (спасибо Chal55rus)
-* добавлена автоустановка игры "Blood and Soul" (спасибо Chal55rus)
+* добавлена автоустановка "Blood and Soul" (спасибо Chal55rus)
+* обновлена автоустановка "World of Sea Battle" (спасибо valokardin)
+* "World of Sea Battle" больше не нужен префикс DOTNET и от
+
 
 
 ###Scripts version 2356### / stable / Дата: 28.09.2024 / Размер скачиваемого обновления: 4 мегабайт

data_from_portwine/scripts/portwine_db/WORLD OF SEA BATTLE (TEXT 2 RU).ppdb

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-#Author: Cefeiko
-#wosb_launcher_ru.exe
-#Rating=?
-################################################
-export PW_COMMENT_DB="С этим ДБ файлом писать на АНГЛИЙСКОМ не получится.
-Для входа в игру используйте ярлык World of Sea Battle EN"
-export PW_PREFIX_NAME="DOTNET"
-export PW_WINDOWS_VER="10"
-export PW_VULKAN_USE="2"
-export WINEDLLOVERRIDES="vulkan-1=n,b"
-export PW_NO_ESYNC="1"
-export PW_USE_D3D_EXTRAS="1"
-export PW_USE_GSTREAMER="1"
-export PW_FORCE_LARGE_ADDRESS_AWARE="1"
-export PW_USE_SHADER_CACHE="1"
-export LAUNCH_PARAMETERS=""
-

data_from_portwine/scripts/portwine_db/WorldOfSeaBattle.ppdb

@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
-#Author: Cefeiko
+#Author: Cefeiko, Fidel
-#wosb_launcher_en.exe
+#wosb_launcher_pp.exe
-#Rating=?
+#Rating=5
 ################################################
 export PW_COMMENT_DB=""
-export PW_PREFIX_NAME="DOTNET"
 export PW_WINDOWS_VER="10"
-export PW_VULKAN_USE="2"
+export PW_VULKAN_USE="1"
 export WINEDLLOVERRIDES="vulkan-1=n,b"
 export PW_NO_ESYNC="1"
 export PW_USE_D3D_EXTRAS="1"
@@ -14,4 +13,3 @@ export PW_USE_GSTREAMER="1"
 export PW_FORCE_LARGE_ADDRESS_AWARE="1"
 export PW_USE_SHADER_CACHE="1"
 export LAUNCH_PARAMETERS=""
-export LANG=en_US.UTF-8

data_from_portwine/scripts/pw_autoinstall/PW_FARLIGHT84

@@ -8,7 +8,7 @@ export PW_PREFIX_NAME="FARLIGHT_84"
 start_portwine
 if try_download "https://static-gl.lilithgame.com/p/pcsdk/launcher/10060/prodef4621e968ad6b383b8754148b63/0/launcher/res/release/Farlight84_setup_1.3.0.1_238.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Farlight 84."
+    pw_start_progress_bar_install_game "Farlight 84."
     create_new_dir "$WINEPREFIX/drive_c/Program Files (x86)/Farlight84"
     "$pw_7z" x -y "${PW_AUTOINSTALL_EXE}" -o"$WINEPREFIX/drive_c/Program Files (x86)/Farlight84"
     "$pw_7z" x -y "$WINEPREFIX/drive_c/Program Files (x86)/Farlight84/launcher.7z" -o"$WINEPREFIX/drive_c/Program Files (x86)/Farlight84"

data_from_portwine/scripts/pw_autoinstall/PW_GAMEFORGE

@@ -24,7 +24,7 @@ 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}"
 then
-    pw_start_progress_bar_block "Gameforge-Client."
+    pw_start_progress_bar_install_game "Gameforge-Client."
     pw_shutdown_please SparkWebHelper.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GameforgeClient/gfclient.exe"

data_from_portwine/scripts/pw_autoinstall/PW_HO_YO_PLAY

@@ -10,7 +10,7 @@ start_portwine
 
 if try_download "https://sg-public-api.hoyoverse.com/event/download_porter/trace/hyp_global/hyphoyoverse/default?url=https%3A%2F%2Fhoyoplay.hoyoverse.com%2F" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing HoYoPlay Launcher."
+    pw_start_progress_bar_install_game "HoYoPlay Launcher."
     pw_kill_autostart HYP.exe &
     export PATH_TO_GAME="${PW_USER_TEMP}"
     pw_run "${PW_AUTOINSTALL_EXE}"

data_from_portwine/scripts/pw_autoinstall/PW_WGC

@@ -10,7 +10,7 @@ start_portwine
 
 if try_download "https://redirect.wargaming.net/WGC/Wargaming_Game_Center_Install_WoT_${WGC_LOC}.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Starting WGC installation..."
+    pw_start_progress_bar_install_game "WGC."
     pw_kill_autostart wgc.exe &
     pw_run "${PW_AUTOINSTALL_EXE}"
     portwine_exe="$WINEPREFIX/drive_c/ProgramData/Wargaming.net/GameCenter/api/wgc_api.exe"

data_from_portwine/scripts/pw_autoinstall/PW_WORLD_OF_SEA_BATTLE

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
 # Author: Cefeiko
 ########################################################################
-LAUNCH_PARAMETERS=("/S")
+export LAUNCH_PARAMETERS=("/S")
-export PW_PREFIX_NAME="DOTNET"
+export PW_PREFIX_NAME="WORLD_OF_SEA_BATTLE"
-export PW_DLL_INSTALL="faudio dotnet48"
+export PW_VULKAN_USE="1"
-export PW_VULKAN_USE=1
 export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/installer.exe"
+export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle"
 
 WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseabattle.com/download2 2>/dev/null | grep 'installer.exe' | awk -F'xsolla-launcher-update/' '{print $2}' | awk -F'/' '{print $1}')"
 [[ -n "$WOSB_VERSION" ]] && print_info "Found version: $WOSB_VERSION" || yad_error "Error while get version of WOSB INSTALLER."
@@ -13,26 +13,14 @@ WOSB_VERSION="$(curl -s --list-only --connect-timeout 3 https://www.worldofseaba
 start_portwine
 if try_download "https://installer.launcher.xsolla.com/xlauncher-builds/xsolla-launcher-update/${WOSB_VERSION}/bin/installer.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
 then
-    pw_start_progress_bar_block "Installing World of Sea Battle."
+    pw_start_progress_bar_install_game "World of Sea Battle."
     pw_run "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${PW_AUTOINSTALL_EXE}"
     try_remove_file "${portwine_exe}.ppdb"
-    portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe"
+    export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe"
+    pw_create_unique_exe "wosb_launcher_pp"
+    kill_portwine
     pw_stop_progress_bar
-
+    portwine_create_shortcut
-    export PW_NO_RESTART_PPDB="1"
-    if [[ "$LANGUAGE" == "ru" ]] ; then
-        export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle RU"
-        pw_create_unique_exe "wosb_launcher_ru"
-        try_remove_file "${portwine_exe}.ppdb"
-        export PW_SKIP_RESTART_STEAM=1
-        portwine_create_shortcut block_name
-    fi
-
-    export PORTWINE_CREATE_SHORTCUT_NAME="World of Sea Battle EN"
-    pw_create_unique_exe "wosb_launcher_en"
-    try_remove_file "${portwine_exe}.ppdb"
-    portwine_create_shortcut block_name
-
 fi
 stop_portwine

data_from_portwine/scripts/start.sh

@@ -30,25 +30,26 @@ export orig_IFS="$IFS"
 MISSING_DESKTOP_FILE="0"
 
 unset PW_NO_RESTART_PPDB PW_DISABLED_CREATE_DB
+
 if [[ "$1" == *.[Pp][Pp][Aa][Cc][Kk] ]] ; then
     export PW_NO_RESTART_PPDB="1"
     export PW_DISABLED_CREATE_DB="1"
     portwine_exe="$1"
 elif [[ -f "$1" ]] ; then
-    portwine_exe="$(realpath "$1")"
+    portwine_exe="$(realpath -s "$1")"
 elif [[ -f "$OLDPWD/$1" ]] \
 && [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Rr][Ee][Gg] || "$1" == *.[Mm][Ss][Ii] ]]
 then
-    portwine_exe="$(realpath "$OLDPWD/$1")"
+    portwine_exe="$(realpath -s "$OLDPWD/$1")"
 elif [[ "$1" == "--debug" ]] \
 && [[ -f "$2" ]]
 then
-    portwine_exe="$(realpath "$2")"
+    portwine_exe="$(realpath -s "$2")"
 elif [[ "$1" == "--debug" ]] \
 && [[ -f "$OLDPWD/$2" ]] \
 && [[ "$2" == *.[Ee][Xx][Ee] || "$2" == *.[Bb][Aa][Tt] || "$2" == *.[Rr][Ee][Gg] || "$2" == *.[Mm][Ss][Ii] ]]
 then
-    portwine_exe="$(realpath "$OLDPWD/$2")"
+    portwine_exe="$(realpath -s "$OLDPWD/$2")"
 elif [[ "$1" == *.[Ee][Xx][Ee] || "$1" == *.[Bb][Aa][Tt] || "$1" == *.[Mm][Ss][Ii] || "$1" == *.[Rr][Ee][Gg] ]]
 then
     portwine_exe="$1"
@@ -714,7 +715,7 @@ else
     --field="   EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click --normal PW_EVE"' \
     --field="   Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click --normal PW_ROCKSTAR"' \
     --field="   Gameforge Client"!"$PW_GUI_ICON_PATH/gameforge.png"!"":"FBTN" '@bash -c "button_click --normal  PW_GAMEFORGE"' \
-    --field="   World of Sea Battle (x64)"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click --normal PW_WOSB"' \
+    --field="   World of Sea Battle"!"$PW_GUI_ICON_PATH/wosb.png"!"":"FBTN" '@bash -c "button_click --normal PW_WORLD_OF_SEA_BATTLE"' \
     --field="   CALIBER"!"$PW_GUI_ICON_PATH/caliber.png"!"":"FBTN" '@bash -c "button_click --normal PW_CALIBER"' \
     --field="   Crossout"!"$PW_GUI_ICON_PATH/crossout.png"!"":"FBTN" '@bash -c "button_click --normal PW_CROSSOUT"' \
     --field="   Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click --normal PW_WARFRAME"' \

data_from_portwine/scripts/var

@@ -46,7 +46,7 @@ export PW_FAKE_DLSS_VER="230506"
 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_9-12"
+export PW_PROTON_LG_VER="PROTON_LG_9-15"
 export PW_WINE_LG_VER="WINE_LG_9-12-2"
 export PW_WINE_FULLSCREEN_FSR="1"
 export WINE_FULLSCREEN_FSR_MODE="ultra"