Compare commits

...

5 Commits

Author SHA1 Message Date
Mikhail Tergoev
2ae80e3bfe Scripts version 2404 2025-03-20 19:23:03 +03:00
Mikhail Tergoev
ad0ad7bfcb updated EVE autoinstall 2025-03-20 19:07:30 +03:00
Mikhail Tergoev
8016e29943 updated path for WOSB installing 2025-03-20 19:06:55 +03:00
Mikhail Tergoev
aee6693946 fixed create_name_png 2025-03-20 19:05:52 +03:00
Mikhail Tergoev
ddf4c8b298 fixed license 2025-03-20 16:35:33 +03:00
8 changed files with 72 additions and 61 deletions

@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux-
---------------------------------------- ----------------------------------------
Changelog: Changelog:
###Scripts version 2404### / Date: 20.03.2025 / Download update size: 4 megabytes
* fixed license display
* fixed the work of the game "Eve Online" (to use correction, use the autoinstalling Eve Online from Portproton)
* updated installer for "World of Sea Battle"
###Scripts version 2403### / stable / Date: 18.03.2025 / Download update size: 200 megabytes ###Scripts version 2403### / stable / Date: 18.03.2025 / Download update size: 200 megabytes
* cumulative update to the stable version of PortProton scripts * cumulative update to the stable version of PortProton scripts

@ -2,6 +2,11 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2404### / Дата: 20.03.2025 / Размер скачиваемого обновления: 4 мегабайта
* исправлено отображение лицензии
* исправлена работа игры "EVE Online" (для применения исправления воспользуйтесь автоустановкой лончера EVE Online из PortProton)
* обновлен установщик для "World of Sea Battle"
###Scripts version 2403### / stable / Дата: 18.03.2025 / Размер скачиваемого обновления: 200 мегабайт ###Scripts version 2403### / stable / Дата: 18.03.2025 / Размер скачиваемого обновления: 200 мегабайт
* кумулятивное обновление стабильной версии скриптов PortProton * кумулятивное обновление стабильной версии скриптов PortProton

@ -7,17 +7,17 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-03-07 17:14+0500\n" "POT-Creation-Date: 2025-03-20 16:24+0300\n"
"PO-Revision-Date: 2025-03-07 17:18+0500\n" "PO-Revision-Date: 2025-03-20 16:12+0300\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"Language: ru_RU\n" "Language: ru_RU\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
"X-Generator: Poedit 3.4.4\n" "X-Generator: Poedit 3.5\n"
msgid "" msgid ""
"A running PortProton session was detected.\\nDo you want to end the previous " "A running PortProton session was detected.\\nDo you want to end the previous "
@ -1658,7 +1658,6 @@ msgstr ""
"запуском), работает вместе с SDL BACKEND (используется по умолчанию в " "запуском), работает вместе с SDL BACKEND (используется по умолчанию в "
"Wayland сессии)" "Wayland сессии)"
#, fuzzy
msgid "" msgid ""
"if specified, sets a base output height to linearly scale the cursor against." "if specified, sets a base output height to linearly scale the cursor against."
msgstr "" msgstr ""
@ -2045,13 +2044,6 @@ msgstr "НАЗАД"
msgid "SAVE" msgid "SAVE"
msgstr "СОХРАНИТЬ" msgstr "СОХРАНИТЬ"
msgid ""
"This program comes with absolutely no warranty.\n"
"See the License for details."
msgstr ""
"Эта программа поставляется без каких-либо гарантий.\n"
"Подробнее см. в Лицензия."
msgid "" msgid ""
"Author: Casro-Fidel (Mikhail Tergoev)\n" "Author: Casro-Fidel (Mikhail Tergoev)\n"
"\n" "\n"
@ -2076,7 +2068,7 @@ msgstr "Хотите присоединится и помочь в развит
msgid "" msgid ""
"Website: http://linux-gaming.ru\n" "Website: http://linux-gaming.ru\n"
"Discord: http://discord.gg/yJSEFjF\n" "TG: https://t.me/linux_gaming_ru\n"
"VK: https://vk.com/linuxgamingru\n" "VK: https://vk.com/linuxgamingru\n"
"-------------------------------------------\n" "-------------------------------------------\n"
"Become a paid subscriber:\n" "Become a paid subscriber:\n"
@ -2085,7 +2077,7 @@ msgid ""
"-------------------------------------------" "-------------------------------------------"
msgstr "" msgstr ""
"Website: https://linux-gaming.ru/\n" "Website: https://linux-gaming.ru/\n"
"Discord: http://discord.gg/yJSEFjF\n" "TG: https://t.me/linux_gaming_ru\n"
"VK: https://vk.com/linuxgamingru\n" "VK: https://vk.com/linuxgamingru\n"
"-------------------------------------------\n" "-------------------------------------------\n"
"Стать платным подписчиком:\n" "Стать платным подписчиком:\n"
@ -2120,9 +2112,6 @@ msgstr ""
msgid "ABOUT US" msgid "ABOUT US"
msgstr "О НАС" msgstr "О НАС"
msgid "ABOUT PORTPROTON"
msgstr "О PORTPROTON"
msgid "AUTORS" msgid "AUTORS"
msgstr "АВТОРЫ" msgstr "АВТОРЫ"
@ -2138,6 +2127,16 @@ msgstr "ПРИСОЕДЕНИТЬСЯ"
msgid "THIRD PARTY LIBRARIES" msgid "THIRD PARTY LIBRARIES"
msgstr "БИБЛИОТЕКИ" msgstr "БИБЛИОТЕКИ"
#~ msgid ""
#~ "This program comes with absolutely no warranty.\n"
#~ "See the License for details."
#~ msgstr ""
#~ "Эта программа поставляется без каких-либо гарантий.\n"
#~ "Подробнее см. в Лицензия."
#~ msgid "ABOUT PORTPROTON"
#~ msgstr "О PORTPROTON"
#~ msgid "Mirror changed to:" #~ msgid "Mirror changed to:"
#~ msgstr "Зеркало для скачивания изменено на:" #~ msgstr "Зеркало для скачивания изменено на:"

@ -2950,13 +2950,6 @@ pw_create_gui_png () {
export name_desktop_png="bat" export name_desktop_png="bat"
return 0 return 0
fi fi
name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then
local ICON_NAME_REGEX=(\! % \$ \& \<)
for i in "${ICON_NAME_REGEX[@]}" ; do
name_desktop_png="${name_desktop_png//$i/}"
done
fi
fi fi
if [[ -z "$PORTPROTON_NAME" ]] \ if [[ -z "$PORTPROTON_NAME" ]] \
@ -2998,6 +2991,16 @@ pw_create_gui_png () {
edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION
fi fi
if [[ -z $name_desktop_png ]] ; then
name_desktop_png="${PORTPROTON_NAME// /_}"
if [[ $name_desktop_png =~ [\!\%\$\&\<] ]] ; then
local ICON_NAME_REGEX=(\! % \$ \& \<)
for i in "${ICON_NAME_REGEX[@]}" ; do
name_desktop_png="${name_desktop_png//$i/}"
done
fi
fi
resize_png "$portwine_exe" "${PORTPROTON_NAME}" "48" "128" resize_png "$portwine_exe" "${PORTPROTON_NAME}" "48" "128"
PORTPROTON_NAME_PNG="${PORTPROTON_NAME// /_}" PORTPROTON_NAME_PNG="${PORTPROTON_NAME// /_}"
@ -7056,24 +7059,15 @@ gui_credits () {
# shellcheck source=/dev/null # shellcheck source=/dev/null
source "${PORT_WINE_PATH}/data/scripts/thanks" source "${PORT_WINE_PATH}/data/scripts/thanks"
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --show-uri --scroll \ "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=1 --scroll \
--text-align=center --text="${translations[PortProton v. \${install_ver}
scripts v. \${scripts_install_ver}]}" --text-info <<< "https://linux-gaming.ru
$(eval_translations "Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru)" "DATE=$(date +%Y)")
${translations[This program comes with absolutely no warranty.
See the License for details.]}" 2>/dev/null &
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --scroll \
--text-info <<< "${translations[Author: Casro-Fidel (Mikhail Tergoev) --text-info <<< "${translations[Author: Casro-Fidel (Mikhail Tergoev)
Developer assistants and testers:]} Developer assistants and testers:]}
$(credits_devel)" 2>/dev/null & $(credits_devel)" 2>/dev/null &
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 --text-info --scroll < <(eval_translations "MIT License "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=2 --text-info --scroll <<< "MIT License
Copyright © \$%DATE% Castro-Fidel (linux-gaming.ru) Copyright © $(date +%Y) Castro-Fidel (linux-gaming.ru)
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the \"Software\"), to deal of this software and associated documentation files (the \"Software\"), to deal
@ -7091,9 +7085,9 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE." "DATE=$(date +%Y)") 2>/dev/null & SOFTWARE." "DATE=$(date +%Y)" 2>/dev/null &
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \ "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=3 \
--text-info --show-uri --scroll \ --text-info --show-uri --scroll \
<<< "${translations[The project was supported: <<< "${translations[The project was supported:
https://boosty.to/portwine-linux.ru]} https://boosty.to/portwine-linux.ru]}
@ -7101,11 +7095,11 @@ $(credits_boosty)
${translations[The list will be updated...]}" 2>/dev/null & ${translations[The list will be updated...]}" 2>/dev/null &
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 \ "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=4 \
--text="${translations[Do you want to join and help in the development of the project:]}" \ --text="${translations[Do you want to join and help in the development of the project:]}" \
--image-path="$PW_GUI_ICON_PATH" --image="port_proton" \ --image-path="$PW_GUI_ICON_PATH" --image="port_proton" \
--uri-color=red --show-uri --text-info --scroll <<< "${translations[Website: http://linux-gaming.ru --uri-color=red --show-uri --text-info --scroll <<< "${translations[Website: http://linux-gaming.ru
Discord: http://discord.gg/yJSEFjF TG: https://t.me/linux_gaming_ru
VK: https://vk.com/linuxgamingru VK: https://vk.com/linuxgamingru
------------------------------------------- -------------------------------------------
Become a paid subscriber: Become a paid subscriber:
@ -7113,7 +7107,7 @@ boosty: https://boosty.to/portwine-linux.ru
Yandex wallet: 410012267513818 Yandex wallet: 410012267513818
-------------------------------------------]}" 2>/dev/null & -------------------------------------------]}" 2>/dev/null &
"${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=6 --show-uri --title="THIRD PARTY LIBRARIES" \ "${pw_yad}" --plug="${KEY_CREDITS}" --tabnum=5 --show-uri --title="THIRD PARTY LIBRARIES" \
--text-info <<< "${translations[ Third-party libraries that are used in PortProton --text-info <<< "${translations[ Third-party libraries that are used in PortProton
PortProton is built on the basis of the following free software libraries: PortProton is built on the basis of the following free software libraries:
@ -7125,9 +7119,10 @@ YAD: https://github.com/v1cont/yad
DGVOODOO2: https://dege.fw.hu/]}" 2>/dev/null & DGVOODOO2: https://dege.fw.hu/]}" 2>/dev/null &
"${pw_yad}" --title "${translations[ABOUT US]}" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \ "${pw_yad}" --title "${translations[ABOUT US]}" --key="${KEY_CREDITS}" --window-icon="$PW_GUI_ICON_PATH/portproton.svg" \
--notebook --no-buttons --tab-pos=bottom --expand --width=750 --height=400 \ --notebook --no-buttons --tab-pos=bottom --expand --width=950 --height=500 \
--tab="${translations[ABOUT PORTPROTON]}" --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \ --tab="${translations[AUTORS]}" --tab="${translations[LICENSE]}" \
--tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" --tab="${translations[THIRD PARTY LIBRARIES]}" --tab="${translations[SPONSORS]}" --tab="${translations[JOIN]}" \
--tab="${translations[THIRD PARTY LIBRARIES]}"
restart_pp restart_pp
} }

@ -15,8 +15,8 @@ if [[ "${DESKTOP_SESSION}" =~ "gnome" ]] \
fi fi
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
export PW_WINE_USE="WINE_LG" export PW_WINE_USE="WINE_LG"
export PW_USE_WINE_DXGI="1" export PW_USE_WINE_DXGI="0"
export PW_VULKAN_USE="1" export PW_VULKAN_USE="2"
export PW_USE_GSTREAMER="0" export PW_USE_GSTREAMER="0"
export PW_PREFIX_NAME="EVE_ONLINE" export PW_PREFIX_NAME="EVE_ONLINE"
export PW_WINE_FULLSCREEN_FSR="0" export PW_WINE_FULLSCREEN_FSR="0"

@ -8,8 +8,8 @@
######################################################################## ########################################################################
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
export PW_WINE_USE="WINE_LG" export PW_WINE_USE="WINE_LG"
export PW_USE_WINE_DXGI="1" export PW_USE_WINE_DXGI="0"
export PW_VULKAN_USE="1" export PW_VULKAN_USE="2"
export PW_USE_GSTREAMER="0" export PW_USE_GSTREAMER="0"
export PW_PREFIX_NAME="EVE_ONLINE" export PW_PREFIX_NAME="EVE_ONLINE"
export PW_WINE_FULLSCREEN_FSR="0" export PW_WINE_FULLSCREEN_FSR="0"
@ -20,7 +20,6 @@ export PW_USE_EAC_AND_BE="1"
export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta export PW_DLL_INSTALL="vcrun2022 d3dcompiler_47 arial tahoma" # msdelta
export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n" export WINEDLLOVERRIDES="msvcp140,msvcp140_1=n"
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe" export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/eve-online-latest+Setup.exe"
export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
start_portwine start_portwine
if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror if try_download "https://launcher.ccpgames.com/eve-online/release/win32/x64/eve-online-latest+Setup.exe" "${PW_AUTOINSTALL_EXE}" no_mirror
@ -29,24 +28,29 @@ then
EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online" EVE_LAUNCHER_DIR="${WINEPREFIX}/drive_c/users/steamuser/AppData/Local/eve-online"
$pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y $pw_7z x "${PW_USER_TEMP}/eve-online-latest+Setup.exe" -o"${EVE_LAUNCHER_DIR}" -y
$pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y EVE_VERSION="$(cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}')"
APP_DIR="app-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`" $pw_7z x "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" -o"${EVE_LAUNCHER_DIR}/tmp" -y
create_new_dir "${EVE_LAUNCHER_DIR}/$APP_DIR"
create_new_dir "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION"
create_new_dir "${EVE_LAUNCHER_DIR}/packages/SquirrelTemp" create_new_dir "${EVE_LAUNCHER_DIR}/packages/SquirrelTemp"
cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/$APP_DIR" cp -r "${EVE_LAUNCHER_DIR}/tmp/lib/net45/." "${EVE_LAUNCHER_DIR}/app-$EVE_VERSION"
cp "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/packages" cp "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/packages"
mv "${EVE_LAUNCHER_DIR}/${APP_DIR}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe" mv "${EVE_LAUNCHER_DIR}/app-${EVE_VERSION}/eve-online_ExecutionStub.exe" "${EVE_LAUNCHER_DIR}/eve-online.exe"
cp "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/packages" cp "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/packages"
mv "${EVE_LAUNCHER_DIR}/setupIcon.ico" "${EVE_LAUNCHER_DIR}/app.ico" mv "${EVE_LAUNCHER_DIR}/setupIcon.ico" "${EVE_LAUNCHER_DIR}/app.ico"
rm -rf "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-`cat "${EVE_LAUNCHER_DIR}/RELEASES" | awk '{print $2}' | awk -F"-" '{print $3}'`-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp" rm -rf "${EVE_LAUNCHER_DIR}/background.gif" "${EVE_LAUNCHER_DIR}/eve-online-${EVE_VERSION}-full.nupkg" "${EVE_LAUNCHER_DIR}/RELEASES" "${EVE_LAUNCHER_DIR}/tmp"
pw_stop_progress_bar
portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe" portwine_exe="${EVE_LAUNCHER_DIR}/eve-online.exe"
pw_stop_progress_bar
portwine_create_shortcut
try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}"
try_remove_file "${portwine_exe}.ppdb" try_remove_file "${portwine_exe}.ppdb"
export PORTWINE_CREATE_SHORTCUT_NAME="EVE Online Launcher"
portwine_create_shortcut
fi fi
stop_portwine stop_portwine

@ -22,7 +22,10 @@ then
pw_run "${PW_AUTOINSTALL_EXE}" pw_run "${PW_AUTOINSTALL_EXE}"
try_remove_file "${PW_AUTOINSTALL_EXE}" try_remove_file "${PW_AUTOINSTALL_EXE}"
try_remove_file "${portwine_exe}.ppdb" try_remove_file "${portwine_exe}.ppdb"
export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe" if [[ -f "$WINEPREFIX/drive_c/Games/Wosb Launcher/launcher.exe" ]]
then export portwine_exe="$WINEPREFIX/drive_c/Games/Wosb Launcher/launcher.exe"
else export portwine_exe="$WINEPREFIX/drive_c/users/steamuser/AppData/Local/Wosb Launcher/launcher.exe"
fi
pw_create_unique_exe "wosb_launcher_pp" pw_create_unique_exe "wosb_launcher_pp"
kill_portwine kill_portwine
pw_stop_progress_bar pw_stop_progress_bar

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2403 #SCRIPTS_NEXT_VERSION=2404
#SCRIPTS_STABLE_VERSION=2403 #SCRIPTS_STABLE_VERSION=2403
######################################################################## ########################################################################
export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT" export AI_TOP_GAMES="PW_LGC PW_VKPLAY PW_EPIC PW_BATTLE_NET PW_WORLD_OF_SEA_BATTLE PW_RUSSIAN_FISHING PW_HO_YO_PLAY PW_FARLIGHT84 PW_WARFRAME PW_WGC PW_UBISOFT"