Skip to content

P
PortWINE
Commit f130c342 authored by Mikhail Tergoev's avatar Mikhail Tergoev
Browse files
Options

Scripts version 2275

parent 20833eaf
Hide whitespace changes
Inline Side-by-side
Showing with 405 additions and 151 deletions
.vscode/launch.json 0 → 100644
View file @ f130c342
{
// Используйте IntelliSense, чтобы узнать о возможных атрибутах.
// Наведите указатель мыши, чтобы просмотреть описания существующих атрибутов.
// Для получения дополнительной информации посетите: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "bashdb",
"request": "launch",
"name": "Bash-Debug (simplest configuration)",
"program": "/home/fidel/PortProton/data/scripts/start.sh"
}
]
}
\ No newline at end of file
data_from_portwine/changelog_eng
View file @ f130c342
...@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux- ...@@ -2,6 +2,17 @@ You can help us in the development of the project on the website: https://linux-
---------------------------------------- ----------------------------------------
Changelog: Changelog:
###Scripts version 2275### Date: 14.04.2024 / Download update size: 175 megabytes
* all archives of wine libraries and versions have been moved to CDN (download speed correction)
* the libs_v48 library package has been updated
* added Russian language support in Steam Deck game mode
* fixed the operation of Sony Playstation gamepads (thanks Ardash for identifying the problem)
* fixed the work of the latest versions of SVN on NVIDIA 550+ drivers (problems are still possible with MANGOHUD)
* updated icons in the AUTO-INSTALLATION tab (thanks Dervart)
* added color detection of the system theme to change the tray icon (thanks to Boria138 and Dervart)
* added support for disabling deepin compositing (thanks Boria138)
* fixed GALLIUM_NINE in flatpak (thanks Boria138)
###Scripts version 2274### Date: 07.04.2024 / Download update size: 15 megabytes ###Scripts version 2274### Date: 07.04.2024 / Download update size: 15 megabytes
* added the previous theme for PortProton, enabled by adding "export GUI_THEME=classic" to "data/user.conf" * added the previous theme for PortProton, enabled by adding "export GUI_THEME=classic" to "data/user.conf"
......
data_from_portwine/changelog_rus
View file @ f130c342
...@@ -2,8 +2,16 @@ ...@@ -2,8 +2,16 @@
----------------------------------------- -----------------------------------------
История изменений: История изменений:
###Scripts version 2275### Дата: 14.04.2024 / Размер скачиваемого обновления: 175 мегабайт
* все архивы библиотек и версий wine перенесены на CDN (исправление скорости скачивания)
* обновлен пакет библиотек libs_v48
* добавлена поддержка русского языка в игровом режиме Steam Deck * добавлена поддержка русского языка в игровом режиме Steam Deck
* обновлены иконки во вкладке АВТОУСТАНОВКА * исправлена работа геймпадов от Sony Playstation (спасибо Ardash за выявление проблемы)
* исправлена работа новейших версий DXVK на драйверах NVIDIA 550+ (c MANGOHUD всё еще возможны проблемы)
* обновлены иконки во вкладке АВТОУСТАНОВКА (спасибо Dervart)
* добавлено определение цвета системной темы для изменения иконки в трее (спасибо Boria138 и Dervart)
* добавлена поддержка отключения композитинга deepin (спасибо Boria138)
* исправлена работа GALLIUM_NINE во flatpak (спасибо Hty за выявление проблемы, спасибо Boria138 за PR)
###Scripts version 2274### Дата: 07.04.2024 / Размер скачиваемого обновления: 15 мегабайт ###Scripts version 2274### Дата: 07.04.2024 / Размер скачиваемого обновления: 15 мегабайт
* добавлена предыдущая тема для PortProton, включается добавлением "export GUI_THEME=classic" в "data/user.conf" * добавлена предыдущая тема для PortProton, включается добавлением "export GUI_THEME=classic" в "data/user.conf"
...@@ -113,7 +121,7 @@ ...@@ -113,7 +121,7 @@
* добавлена функция отключения композитинга (спасибо Boria138) * добавлена функция отключения композитинга (спасибо Boria138)
* для префиксов созданных вручную, добавлен выбор его наполнения (чистый, или с рекомендованными библиотеками) * для префиксов созданных вручную, добавлен выбор его наполнения (чистый, или с рекомендованными библиотеками)
* улучшена функция обновления префикса при смене версии WINE-PROTON * улучшена функция обновления префикса при смене версии WINE-PROTON
* улучшение переводов * улучшение переводов
* множество небольших улучшений скриптов * множество небольших улучшений скриптов
###Scripts version 2256### Дата: 13.02.2024 / Размер скачиваемого обновления: 15 мегабайт ###Scripts version 2256### Дата: 13.02.2024 / Размер скачиваемого обновления: 15 мегабайт
......
data_from_portwine/img/gui/close.png
View replaced file @ 20833eaf View file @ f130c342
data_from_portwine/img/gui/close.png

1.62 KB | W: 0px | H: 0px

data_from_portwine/img/gui/close.png

783 Bytes | W: 0px | H: 0px

data_from_portwine/img/gui/close.png
data_from_portwine/img/gui/close.png
data_from_portwine/img/gui/close.png
data_from_portwine/img/gui/close.png
  • 2-up
  • Swipe
  • Onion skin
data_from_portwine/img/gui/history.png
View replaced file @ 20833eaf View file @ f130c342
data_from_portwine/img/gui/history.png

1.21 KB | W: 0px | H: 0px

data_from_portwine/img/gui/history.png

949 Bytes | W: 0px | H: 0px

data_from_portwine/img/gui/history.png
data_from_portwine/img/gui/history.png
data_from_portwine/img/gui/history.png
data_from_portwine/img/gui/history.png
  • 2-up
  • Swipe
  • Onion skin
data_from_portwine/img/gui/portproton_tray_dark.svg 0 → 100644
View file @ f130c342
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 600 600"
version="1.1"
id="svg3"
sodipodi:docname="portproton_tray-dark.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
inkscape:export-filename="portproton_tray3.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview3"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.85"
inkscape:cx="-121.76471"
inkscape:cy="457.64706"
inkscape:window-width="2991"
inkscape:window-height="1194"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3" />
<defs
id="defs2">
<linearGradient
id="a"
x1="300"
x2="300"
y1="44"
y2="556"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.92003363,0,0,0.92003363,43.783997,13.178384)">
<stop
offset="0"
stop-color="#46bac6"
id="stop1" />
<stop
offset="1"
stop-color="#1497a5"
id="stop2" />
</linearGradient>
</defs>
<g
id="g4"
transform="translate(-6.7840858,-19.964294)">
<ellipse
cx="-319.7941"
cy="-289.18845"
id="circle1"
style="fill:#ffffff;stroke-width:11.4589"
transform="scale(-1)"
rx="56.955902"
ry="57.635761" />
<g
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
id="g3"
transform="matrix(20.50461,8.6382238,-8.6348702,20.512573,27.749764,-417.23972)"
style="fill:#ffffff">
<g
fill="#000000"
fill-rule="nonzero"
id="g2"
style="fill:#ffffff">
<path
d="m 31.12853,12.540064 c 1.925619,1.111645 2.585165,3.573996 1.47352,5.498885 -1.111645,1.925619 -3.573509,2.585407 -5.499372,1.473762 -1.301337,-0.751473 -2.023869,-2.120661 -2.012196,-3.523654 -0.22301,-0.01824 -0.446993,-0.02845 -0.671462,-0.02845 -2.789934,0 -5.258121,1.400561 -6.740152,3.535085 -0.709887,-0.404434 -1.519727,-0.652979 -2.384529,-0.695538 1.84269,-3.124085 5.242558,-5.225047 9.124681,-5.225047 0.480554,0 0.958189,0.03283 1.43096,0.09728 1.192143,-1.658833 3.471368,-2.175623 5.27855,-1.132316 z M 11,24.161143 c 0,-2.22329 1.802319,-4.025609 4.025609,-4.025852 2.22329,0 4.026095,1.802562 4.026095,4.025852 0,1.503189 -0.824431,2.813281 -2.045514,3.504442 0.09582,0.202338 0.198933,0.401515 0.31129,0.595584 1.394724,2.416387 3.841996,3.853427 6.431538,4.069628 0.0041,0.817135 0.194556,1.642539 0.589991,2.413225 C 20.71224,34.710461 17.192234,32.816214 15.251537,29.454528 15.011504,29.038178 14.80114,28.607966 14.620203,28.166566 12.587091,27.963499 11,26.247757 11,24.161143 Z m 20.125855,11.61816 c -1.925375,1.112132 -4.387726,0.451857 -5.499857,-1.473519 -1.111402,-1.925132 -0.451857,-4.387483 1.473762,-5.499128 1.301824,-0.75123 2.848545,-0.69262 4.057711,0.01873 0.127434,-0.183612 0.248302,-0.372332 0.360415,-0.567131 1.394724,-2.4159 1.416125,-5.253744 0.308615,-7.604468 0.705509,-0.412459 1.32517,-0.989804 1.795023,-1.717444 1.784322,3.158132 1.903731,7.153341 -0.03769,10.515027 -0.240034,0.415864 -0.507306,0.813002 -0.799383,1.190684 0.840239,1.861901 0.148349,4.09419 -1.658591,5.137253 z"
id="path1"
style="fill:#ffffff" />
</g>
</g>
</g>
</svg>
data_from_portwine/img/gui/portproton_tray_flatpak.svg 0 → 100644
View file @ f130c342
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 600 600"
version="1.1"
id="svg3"
sodipodi:docname="portproton_tray-blue.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
inkscape:export-filename="portproton_tray3.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview3"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.85"
inkscape:cx="-121.76471"
inkscape:cy="458.82353"
inkscape:window-width="2991"
inkscape:window-height="1194"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3" />
<defs
id="defs2">
<linearGradient
id="a"
x1="300"
x2="300"
y1="44"
y2="556"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.92003363,0,0,0.92003363,43.783997,13.178384)">
<stop
offset="0"
stop-color="#46bac6"
id="stop1" />
<stop
offset="1"
stop-color="#1497a5"
id="stop2" />
</linearGradient>
</defs>
<g
id="g4"
transform="translate(-6.7840858,-19.964294)"
style="fill:#09bec8;fill-opacity:1">
<ellipse
cx="-319.7941"
cy="-289.18845"
id="circle1"
style="fill:#09bec8;stroke-width:11.4589;fill-opacity:1"
transform="scale(-1)"
rx="56.955902"
ry="57.635761" />
<g
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
id="g3"
transform="matrix(20.50461,8.6382238,-8.6348702,20.512573,27.749764,-417.23972)"
style="fill:#09bec8;fill-opacity:1">
<g
fill="#000000"
fill-rule="nonzero"
id="g2"
style="fill:#09bec8;fill-opacity:1">
<path
d="m 31.12853,12.540064 c 1.925619,1.111645 2.585165,3.573996 1.47352,5.498885 -1.111645,1.925619 -3.573509,2.585407 -5.499372,1.473762 -1.301337,-0.751473 -2.023869,-2.120661 -2.012196,-3.523654 -0.22301,-0.01824 -0.446993,-0.02845 -0.671462,-0.02845 -2.789934,0 -5.258121,1.400561 -6.740152,3.535085 -0.709887,-0.404434 -1.519727,-0.652979 -2.384529,-0.695538 1.84269,-3.124085 5.242558,-5.225047 9.124681,-5.225047 0.480554,0 0.958189,0.03283 1.43096,0.09728 1.192143,-1.658833 3.471368,-2.175623 5.27855,-1.132316 z M 11,24.161143 c 0,-2.22329 1.802319,-4.025609 4.025609,-4.025852 2.22329,0 4.026095,1.802562 4.026095,4.025852 0,1.503189 -0.824431,2.813281 -2.045514,3.504442 0.09582,0.202338 0.198933,0.401515 0.31129,0.595584 1.394724,2.416387 3.841996,3.853427 6.431538,4.069628 0.0041,0.817135 0.194556,1.642539 0.589991,2.413225 C 20.71224,34.710461 17.192234,32.816214 15.251537,29.454528 15.011504,29.038178 14.80114,28.607966 14.620203,28.166566 12.587091,27.963499 11,26.247757 11,24.161143 Z m 20.125855,11.61816 c -1.925375,1.112132 -4.387726,0.451857 -5.499857,-1.473519 -1.111402,-1.925132 -0.451857,-4.387483 1.473762,-5.499128 1.301824,-0.75123 2.848545,-0.69262 4.057711,0.01873 0.127434,-0.183612 0.248302,-0.372332 0.360415,-0.567131 1.394724,-2.4159 1.416125,-5.253744 0.308615,-7.604468 0.705509,-0.412459 1.32517,-0.989804 1.795023,-1.717444 1.784322,3.158132 1.903731,7.153341 -0.03769,10.515027 -0.240034,0.415864 -0.507306,0.813002 -0.799383,1.190684 0.840239,1.861901 0.148349,4.09419 -1.658591,5.137253 z"
id="path1"
style="fill:#09bec8;fill-opacity:1" />
</g>
</g>
</g>
</svg>
data_from_portwine/img/gui/portproton_tray_light.svg 0 → 100644
View file @ f130c342
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
viewBox="0 0 600 600"
version="1.1"
id="svg3"
sodipodi:docname="portproton_tray-iight.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
inkscape:export-filename="portproton_tray3.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<sodipodi:namedview
id="namedview3"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="0.85"
inkscape:cx="-121.76471"
inkscape:cy="457.64706"
inkscape:window-width="2991"
inkscape:window-height="1194"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg3" />
<defs
id="defs2">
<linearGradient
id="a"
x1="300"
x2="300"
y1="44"
y2="556"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.92003363,0,0,0.92003363,43.783997,13.178384)">
<stop
offset="0"
stop-color="#46bac6"
id="stop1" />
<stop
offset="1"
stop-color="#1497a5"
id="stop2" />
</linearGradient>
</defs>
<g
id="g4"
transform="translate(-6.7840858,-19.964294)"
style="fill:#000000">
<ellipse
cx="-319.7941"
cy="-289.18845"
id="circle1"
style="fill:#000000;stroke-width:11.4589"
transform="scale(-1)"
rx="56.955902"
ry="57.635761" />
<g
stroke="none"
stroke-width="1"
fill="none"
fill-rule="evenodd"
id="g3"
transform="matrix(20.50461,8.6382238,-8.6348702,20.512573,27.749764,-417.23972)"
style="fill:#000000">
<g
fill="#000000"
fill-rule="nonzero"
id="g2"
style="fill:#000000">
<path
d="m 31.12853,12.540064 c 1.925619,1.111645 2.585165,3.573996 1.47352,5.498885 -1.111645,1.925619 -3.573509,2.585407 -5.499372,1.473762 -1.301337,-0.751473 -2.023869,-2.120661 -2.012196,-3.523654 -0.22301,-0.01824 -0.446993,-0.02845 -0.671462,-0.02845 -2.789934,0 -5.258121,1.400561 -6.740152,3.535085 -0.709887,-0.404434 -1.519727,-0.652979 -2.384529,-0.695538 1.84269,-3.124085 5.242558,-5.225047 9.124681,-5.225047 0.480554,0 0.958189,0.03283 1.43096,0.09728 1.192143,-1.658833 3.471368,-2.175623 5.27855,-1.132316 z M 11,24.161143 c 0,-2.22329 1.802319,-4.025609 4.025609,-4.025852 2.22329,0 4.026095,1.802562 4.026095,4.025852 0,1.503189 -0.824431,2.813281 -2.045514,3.504442 0.09582,0.202338 0.198933,0.401515 0.31129,0.595584 1.394724,2.416387 3.841996,3.853427 6.431538,4.069628 0.0041,0.817135 0.194556,1.642539 0.589991,2.413225 C 20.71224,34.710461 17.192234,32.816214 15.251537,29.454528 15.011504,29.038178 14.80114,28.607966 14.620203,28.166566 12.587091,27.963499 11,26.247757 11,24.161143 Z m 20.125855,11.61816 c -1.925375,1.112132 -4.387726,0.451857 -5.499857,-1.473519 -1.111402,-1.925132 -0.451857,-4.387483 1.473762,-5.499128 1.301824,-0.75123 2.848545,-0.69262 4.057711,0.01873 0.127434,-0.183612 0.248302,-0.372332 0.360415,-0.567131 1.394724,-2.4159 1.416125,-5.253744 0.308615,-7.604468 0.705509,-0.412459 1.32517,-0.989804 1.795023,-1.717444 1.784322,3.158132 1.903731,7.153341 -0.03769,10.515027 -0.240034,0.415864 -0.507306,0.813002 -0.799383,1.190684 0.840239,1.861901 0.148349,4.09419 -1.658591,5.137253 z"
id="path1"
style="fill:#000000" />
</g>
</g>
</g>
</svg>
data_from_portwine/img/gui/wine_file.png
View replaced file @ 20833eaf View file @ f130c342
data_from_portwine/img/gui/wine_file.png

1.3 KB | W: 0px | H: 0px

data_from_portwine/img/gui/wine_file.png

880 Bytes | W: 0px | H: 0px

data_from_portwine/img/gui/wine_file.png
data_from_portwine/img/gui/wine_file.png
data_from_portwine/img/gui/wine_file.png
data_from_portwine/img/gui/wine_file.png
  • 2-up
  • Swipe
  • Onion skin
data_from_portwine/img/gui/wine_system.png
View replaced file @ 20833eaf View file @ f130c342
data_from_portwine/img/gui/wine_system.png

1.35 KB | W: 0px | H: 0px

data_from_portwine/img/gui/wine_system.png

1.1 KB | W: 0px | H: 0px

data_from_portwine/img/gui/wine_system.png
data_from_portwine/img/gui/wine_system.png
data_from_portwine/img/gui/wine_system.png
data_from_portwine/img/gui/wine_system.png
  • 2-up
  • Swipe
  • Onion skin
data_from_portwine/scripts/functions_helper
View file @ f130c342
...@@ -116,97 +116,60 @@ check_process () { ...@@ -116,97 +116,60 @@ check_process () {
} }
export -f check_process export -f check_process
try_download_no_mirror () {
[[ -f "${PW_AUTOINSTALL_EXE}" ]] && try_remove_file "${PW_AUTOINSTALL_EXE}"
PW_DOWNLOAD_FILE_NAME="$(basename $2)"
if check_gamescope_session ; then
$PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \
-H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2"
[ "$?" != 0 ] && return 1 || return 0
fi
set -o pipefail
curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
"${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
--auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
if [ "${PIPESTATUS[0]}" != 0 ] ; then
print_error "Failed to download $PW_DOWNLOAD_FILE_NAME"
return 1
else
print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1"
return 0
fi
}
try_download () { try_download () {
PW_DOWNLOAD_FILE_NAME="$(basename $1)" local filename="$(basename "$1")"
local url="$url_cdn/$filename"
local dest="$2"
local silent="false"
local no_mirror="false"
case "$3" in
silent)
silent=true ;;
no_mirror)
no_mirror=true
url="$1" ;;
esac
[[ ! -f "${pw_yad_v13_0}" ]] && local pw_yad_v13_0="yad"
# If gamescope session is active, use PW_TERM for downloading
if check_gamescope_session ; then if check_gamescope_session ; then
$PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ $PW_TERM curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
-H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" -H 'Pragma: no-cache' -L "$url" -o "$dest"
# $PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \ [ "$?" != 0 ] && return 1 || return 0
# -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2"
return 0
fi fi
[[ ! -f "${pw_yad_v13_0}" ]] && local pw_yad_v13_0="yad"
# Normal download
set -o pipefail set -o pipefail
curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2" 2>&1 | \ if [ "$silent" == "true" ] ; then
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
"${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ -H 'Pragma: no-cache' -L "$url" -o "$dest" 2>&1
--auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ else
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
if [ "${PIPESTATUS[0]}" != 0 ] ; then -H 'Pragma: no-cache' -L "$url" -o "$dest" 2>&1 | \
print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from GitHub."
print_info "Try download ${PW_DOWNLOAD_FILE_NAME} from FTP"
curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -L "ftp://171.22.215.18/archives/${PW_DOWNLOAD_FILE_NAME}" -o "$2" 2>&1 | \
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \ tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
"${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \ "$pw_yad_v13_0" --progress --percentage=0 --text="${loc_downloading} $filename" --auto-close --no-escape \
--auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \ --auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15 --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
if [ "${PIPESTATUS[0]}" != 0 ] ; then
print_error "Failed to download ${PW_DOWNLOAD_FILE_NAME} from FTP."
return 1
fi
fi fi
try_remove_file "${PORT_WINE_TMP_PATH}/download_log"
print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1"
return 0
}
try_download_to_path () {
PW_DOWNLOAD_FILE_NAME="$(basename $1)"
if check_gamescope_session ; then
$PW_TERM curl -f -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" \
-H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME"
[ "$?" != 0 ] && return 1 || return 0
fi
set -o pipefail
curl -f -# -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' \
-H 'Pragma: no-cache' -L "$1" -o "$2/$PW_DOWNLOAD_FILE_NAME" 2>&1 | \
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
"${pw_yad_v13_0}" --progress --percentage=0 --text="${loc_downloading} ${PW_DOWNLOAD_FILE_NAME}" --auto-close --no-escape \
--auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
if [ "${PIPESTATUS[0]}" != 0 ] ; then if [ "${PIPESTATUS[0]}" != 0 ] ; then
print_error "Failed to download $PW_DOWNLOAD_FILE_NAME" if [[ "$no_mirror" != "true" ]] ; then
return 1 print_error "Failed to download $filename from $url, trying GITHUB mirror..."
else url="$1"
print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1" curl -f -# -A 'Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)' -H 'Cache-Control: no-cache, no-store' \
return 0 -H 'Pragma: no-cache' -L "$url" -o "$dest" 2>&1 | \
tr '\r' '\n' | sed -ur 's|[# ]+||g;s|.*=.*||g;s|.*|#Downloading at &\n&|g' | \
"$pw_yad_v13_0" --progress --percentage=0 --text="${loc_downloading} $filename" --auto-close --no-escape \
--auto-kill --center --text-align="center" --fixed --no-buttons --title "PortProton" --width=500 --height=90 \
--window-icon="$PW_GUI_ICON_PATH/portproton.svg" --borders=15
fi
[[ "${PIPESTATUS[0]}" != 0 ]] && print_error "Failed to download $filename from GITHUB. Skipping." && return 1
fi fi
}
try_download_silent () { print_ok "File downloaded successfully: $filename from $url"
PW_DOWNLOAD_FILE_NAME="$(basename $1)" return 0
curl -f -sS -A "Mozilla/5.0 (compatible; Konqueror/2.1.1; X11)" -H 'Cache-Control: no-cache, no-store' -H 'Pragma: no-cache' -L "$1" -o "$2"
if [ "$?" != 0 ] ; then
print_error "Failed to download $PW_DOWNLOAD_FILE_NAME. Skipping."
try_remove_file "$2"
return 1
else
print_ok "File downloaded successfully: $PW_DOWNLOAD_FILE_NAME from $1"
return 0
fi
} }
create_new_dir () { create_new_dir () {
...@@ -308,7 +271,7 @@ unpack_tar_zst () { ...@@ -308,7 +271,7 @@ unpack_tar_zst () {
unset PW_ZSTD_PORT unset PW_ZSTD_PORT
pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif" pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif"
if command -v zstd &>/dev/null ; then if command -v zstd &>/dev/null ; then
tar -I zstd -xhvf "$1" -C "$2" tar -I zstd -xhf "$1" -C "$2"
pw_stop_progress_bar_cover_block pw_stop_progress_bar_cover_block
[ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
else else
...@@ -320,11 +283,11 @@ unpack_tar_zst () { ...@@ -320,11 +283,11 @@ unpack_tar_zst () {
unpack_tar_xz () { unpack_tar_xz () {
if [[ "$3" == "silent" ]] ; then if [[ "$3" == "silent" ]] ; then
tar -Jxhvf "$1" -C "$2" && return 0 || return 1 tar -Jxhf "$1" -C "$2" && return 0 || return 1
else else
set -o pipefail set -o pipefail
pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif" pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif"
tar -Jxhvf "$1" -C "$2" tar -Jxhf "$1" -C "$2"
pw_stop_progress_bar_cover_block pw_stop_progress_bar_cover_block
[ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
fi fi
...@@ -333,7 +296,7 @@ unpack_tar_xz () { ...@@ -333,7 +296,7 @@ unpack_tar_xz () {
unpack_tar_gz () { unpack_tar_gz () {
set -o pipefail set -o pipefail
pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif" pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif"
tar -xhzvf "$1" -C "$2" tar -xhzf "$1" -C "$2"
pw_stop_progress_bar_cover_block pw_stop_progress_bar_cover_block
[ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
} }
...@@ -341,7 +304,7 @@ unpack_tar_gz () { ...@@ -341,7 +304,7 @@ unpack_tar_gz () {
unpack_tar () { unpack_tar () {
set -o pipefail set -o pipefail
pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif" pw_start_progress_bar_cover_block "${COVERS_PATH}/unpacking_${update_loc}.gif"
tar -xhvf "$1" -C "$2" tar -xhf "$1" -C "$2"
pw_stop_progress_bar_cover_block pw_stop_progress_bar_cover_block
[ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0 [ "${PIPESTATUS[0]}" != 0 ] && print_error "File $1 unpacking error." && return 1 || return 0
} }
...@@ -450,14 +413,14 @@ init_wine_ver () { ...@@ -450,14 +413,14 @@ init_wine_ver () {
orig_IFS="$IFS" orig_IFS="$IFS"
IFS=$'\n' IFS=$'\n'
for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do
dist_dir_new=`echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g` dist_dir_new=$(echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g)
if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then
mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}"
fi fi
done done
IFS="$orig_IFS" IFS="$orig_IFS"
fi fi
if [[ -z `ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}"` ]] ; then if ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}" ; then
if [[ "$PW_WINE_USE" =~ PROTON_LG* ]] if [[ "$PW_WINE_USE" =~ PROTON_LG* ]]
then export PW_WINE_USE=PROTON_LG then export PW_WINE_USE=PROTON_LG
else export PW_WINE_USE=WINE_LG else export PW_WINE_USE=WINE_LG
...@@ -474,20 +437,20 @@ init_wine_ver () { ...@@ -474,20 +437,20 @@ init_wine_ver () {
export WINELOADER="${WINEDIR}/bin/wine" export WINELOADER="${WINEDIR}/bin/wine"
export WINESERVER="${WINEDIR}/bin/wineserver" export WINESERVER="${WINEDIR}/bin/wineserver"
if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then if [[ -d "${WINEDIR}/files" && ! -d "${WINEDIR}/dist" ]] ; then
for clear_dist_files in `ls "${WINEDIR}" | sed -e "s/^files$//g" | sed -e "s/^version$//g"` ; do for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^files$//g" | sed -e "s/^version$//g") ; do
rm -fr "${WINEDIR}/$clear_dist_files" rm -fr "${WINEDIR}/$clear_dist_files"
done done
mv -f "${WINEDIR}/files"/* "${WINEDIR}/" mv -f "${WINEDIR}/files"/* "${WINEDIR}/"
rm -fr "${WINEDIR}/files" rm -fr "${WINEDIR}/files"
elif [[ ! -d "${WINEDIR}/files" && -d "${WINEDIR}/dist" ]] ; then elif [[ ! -d "${WINEDIR}/files" && -d "${WINEDIR}/dist" ]] ; then
for clear_dist_files in `ls "${WINEDIR}" | sed -e "s/^dist$//g" | sed -e "s/^version$//g"` ; do for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^dist$//g" | sed -e "s/^version$//g") ; do
rm -fr "${WINEDIR}/$clear_dist_files" rm -fr "${WINEDIR}/$clear_dist_files"
done done
mv -f "${WINEDIR}/dist"/* "${WINEDIR}/" mv -f "${WINEDIR}/dist"/* "${WINEDIR}/"
rm -fr "${WINEDIR}/dist" rm -fr "${WINEDIR}/dist"
elif [ -f "${WINEDIR}/proton_dist.tar" ] ; then elif [ -f "${WINEDIR}/proton_dist.tar" ] ; then
unpack_tar "${WINEDIR}/proton_dist.tar" "${WINEDIR}/" unpack_tar "${WINEDIR}/proton_dist.tar" "${WINEDIR}/"
for clear_dist_files in `ls "${WINEDIR}" | sed -e "s/^bin$//g" | sed -e "s/^lib$//g" | sed -e "s/^lib64$//g" | sed -e "s/^share$//g" | sed -e "s/^version$//g"` ; do for clear_dist_files in $(ls "${WINEDIR}" | sed -e "s/^bin$//g" | sed -e "s/^lib$//g" | sed -e "s/^lib64$//g" | sed -e "s/^share$//g" | sed -e "s/^version$//g") ; do
rm -fr "${WINEDIR}/$clear_dist_files" rm -fr "${WINEDIR}/$clear_dist_files"
done done
fi fi
...@@ -638,8 +601,6 @@ ${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:\ ...@@ -638,8 +601,6 @@ ${PW_PV_OVERRIDES}/i386-linux-gnu/aliases:\
fi fi
done done
# drop portable: libssl 32-bit
try_remove_file "${PW_PLUGINS_PATH}/portable/lib/lib32/libssl.so.1.1"
print_info "RUNTIME is enabled" print_info "RUNTIME is enabled"
} }
...@@ -904,8 +865,8 @@ pw_check_and_download_dxvk_and_vkd3d () { ...@@ -904,8 +865,8 @@ pw_check_and_download_dxvk_and_vkd3d () {
yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1
fi fi
elif try_download_no_mirror "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" \ elif try_download "https://github.com/doitsujin/dxvk/releases/download/v${DXVK_VAR_VER}/dxvk-${DXVK_VAR_VER}.tar.gz" \
"${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" ; then "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" no_mirror ; then
if unpack_tar_gz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}" ; then if unpack_tar_gz "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" "${PW_VULKAN_DIR}" ; then
try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz" try_remove_file "${PW_VULKAN_DIR}/dxvk-${DXVK_VAR_VER}.tar.gz"
else else
...@@ -934,8 +895,8 @@ pw_check_and_download_dxvk_and_vkd3d () { ...@@ -934,8 +895,8 @@ pw_check_and_download_dxvk_and_vkd3d () {
yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1 yad_error_download && pw_check_and_download_dxvk_and_vkd3d || exit 1
fi fi
elif try_download_no_mirror "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" \ elif try_download "https://github.com/HansKristian-Work/vkd3d-proton/releases/download/v${VKD3D_VAR_VER}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" \
"${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" ; then "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" no_mirror ; then
if unpack_tar_zst "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}" ; then if unpack_tar_zst "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" "${PW_VULKAN_DIR}" ; then
try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst" try_remove_file "${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_VAR_VER}.tar.zst"
else else
...@@ -1007,7 +968,7 @@ pw_check_and_download_plugins () { ...@@ -1007,7 +968,7 @@ pw_check_and_download_plugins () {
else else
PW_NOTIFY_TEXT="Please wait for update PortProton" PW_NOTIFY_TEXT="Please wait for update PortProton"
pw_notify_send -u normal pw_notify_send -u normal
if try_download_silent "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" \ if try_download "github.com/Castro-Fidel/wine_builds/releases/download/plugins${PW_PLUGINS_VER}/plugins${PW_PLUGINS_VER}.tar.xz" silent \
"${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" ; then
if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then if unpack_tar_xz "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" "${PORT_WINE_TMP_PATH}" ; then
try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz" try_remove_file "${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}.tar.xz"
...@@ -1197,18 +1158,18 @@ pw_port_update () { ...@@ -1197,18 +1158,18 @@ pw_port_update () {
if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then if [ ! -f "${PORT_WINE_TMP_PATH}/scripts_ver" ] ; then
echo "2022" > "${PORT_WINE_TMP_PATH}/scripts_ver" echo "2022" > "${PORT_WINE_TMP_PATH}/scripts_ver"
fi fi
export scripts_install_ver=`cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1` export scripts_install_ver=$(cat "${PORT_WINE_TMP_PATH}/scripts_ver" | head -n 1)
print_info "Check update..." print_info "Check update..."
if curl -f -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" if curl -f -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
then then
URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine" URL_FOR_CHANGELOG="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine"
URL_TO_PW_MASTER="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz" URL_TO_PW_MASTER="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/master/PortWINE-master.tar.gz"
print_info "OK." print_info "OK."
else else
if curl -f -s --list-only --connect-timeout 3 "https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver" if curl -f -s --list-only --connect-timeout 3 "https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine/scripts/var" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
then then
URL_FOR_CHANGELOG="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/raw/master/data_from_portwine" URL_FOR_CHANGELOG="https://raw.githubusercontent.com/Castro-Fidel/PortWINE/master/data_from_portwine"
URL_TO_PW_MASTER="https://gitlab.eterfund.ru/Castro-Fidel/PortWINE/-/archive/master/PortWINE-master.tar.gz" URL_TO_PW_MASTER="https://github.com/Castro-Fidel/PortWINE/archive/refs/heads/master.tar.gz"
print_info "OK." print_info "OK."
else else
print_error "Unable to determine the version on the server. Skip it..." print_error "Unable to determine the version on the server. Skip it..."
...@@ -1246,7 +1207,7 @@ pw_port_update () { ...@@ -1246,7 +1207,7 @@ pw_port_update () {
echo "######################################################" echo "######################################################"
print_info "Update scripts..." print_info "Update scripts..."
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz"
if try_download_no_mirror "${URL_TO_PW_MASTER}" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" ; then if try_download "${URL_TO_PW_MASTER}" "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" no_mirror ; then
if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" "${PORT_WINE_TMP_PATH}" if unpack_tar_gz "${PORT_WINE_TMP_PATH}/PortWINE-master.tar.gz" "${PORT_WINE_TMP_PATH}"
then then
create_new_dir "${PORT_WINE_TMP_PATH}/scripts_backup" create_new_dir "${PORT_WINE_TMP_PATH}/scripts_backup"
...@@ -1287,7 +1248,7 @@ update_winetricks () { ...@@ -1287,7 +1248,7 @@ update_winetricks () {
|| [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" && ! -z "$W_TRX_EXT_VER" ]] || [[ "$W_TRX_INT_VER" != "$W_TRX_EXT_VER" && ! -z "$W_TRX_EXT_VER" ]]
then then
try_remove_file "${PORT_WINE_TMP_PATH}/winetricks" try_remove_file "${PORT_WINE_TMP_PATH}/winetricks"
if try_download_no_mirror "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks" ; then if try_download "${W_TRX_URL}" "${PORT_WINE_TMP_PATH}/winetricks" no_mirror ; then
W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})" W_TRX_INT_VER="$(cat "${PORT_WINE_TMP_PATH}/winetricks" | grep -i 'WINETRICKS_VERSION=' | sed 's/WINETRICKS_VERSION=//')" && print_info "Winetricks version in port has been updated (${W_TRX_INT_VER})"
chmod u+x "${PORT_WINE_TMP_PATH}/winetricks" chmod u+x "${PORT_WINE_TMP_PATH}/winetricks"
fi fi
...@@ -2231,8 +2192,6 @@ pw_run () { ...@@ -2231,8 +2192,6 @@ pw_run () {
${PW_MANGOHUD_SLR} \ ${PW_MANGOHUD_SLR} \
"${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]}
wait_wineserver wait_wineserver
# ${PW_RUN_GAMESCOPE} \ !!!
fi fi
fi fi
} }
...@@ -2499,29 +2458,21 @@ pw_tray_icon () { ...@@ -2499,29 +2458,21 @@ pw_tray_icon () {
} }
export -f tray_icon_click_exit export -f tray_icon_click_exit
if [[ "$PW_DESKTOP_THEME" == "dark" ]] ; then if check_flatpak
# --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \ then TRAY_ICON="$PW_GUI_ICON_PATH/portproton_tray_flatpak.svg"
"${pw_yad_v13_0}" --notification --no-middle \ elif [[ "$PW_DESKTOP_THEME" == "dark" ]]
--image="$PW_GUI_ICON_PATH/portproton_tray_light.png" \ then TRAY_ICON="$PW_GUI_ICON_PATH/portproton_tray_dark.svg"
--command="bash -c tray_icon_click" \ else TRAY_ICON="$PW_GUI_ICON_PATH/portproton_tray_light.svg"
--tooltip="PortProton" \ fi
--icon-size=32 --menu="| \ "${pw_yad_v13_0}" --notification --no-middle \
${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \ --image="$TRAY_ICON" \
${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \ --command="bash -c tray_icon_click" \
${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \ --tooltip="PortProton" \
${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null & --icon-size=32 --menu="| \
else
# --window-icon="$PW_GUI_ICON_PATH/portproton_tray.png" \
"${pw_yad_v13_0}" --notification --no-middle \
--image="$PW_GUI_ICON_PATH/portproton_tray_dark.png" \
--command="bash -c tray_icon_click" \
--tooltip="PortProton" \
--icon-size=32 --menu="| \
${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \ ${loc_tray_winefile}!bash -c pw_tray_winefile!"$PW_GUI_ICON_PATH/wine_file.png"|| \
${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \ ${loc_tray_tascmng}!bash -c pw_tray_taskmgr!"$PW_GUI_ICON_PATH/wine_system.png"|| \
${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \ ${loc_tray_cangelog}!bash -c open_changelog!"$PW_GUI_ICON_PATH/history.png"|| \
${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null & ${loc_tray_force_exit} !bash -c tray_icon_click_exit!"$PW_GUI_ICON_PATH/close.png"||" 2>/dev/null &
fi
return 0 return 0
} }
...@@ -2626,13 +2577,13 @@ pw_gui_for_edit_db () { ...@@ -2626,13 +2577,13 @@ pw_gui_for_edit_db () {
done done
} }
edit_db_field_read $@ edit_db_field_read $@
PW_WINDOWS_VER="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $1}'`" PW_WINDOWS_VER="$(cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $1}')"
PW_DLL_INSTALL=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $2}'` PW_DLL_INSTALL="$(cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $2}')"
WINEDLLOVERRIDES=`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $3}'` 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}'` 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}'`" CPU_LIMIT="$(cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $7}')"
PW_GPU_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 $8}')"
GAMESCOPE_ARGS="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $9}'`" GAMESCOPE_ARGS="$(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}'`" # PW_AMD_VULKAN_USE="`cat "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" | awk -F"%" '{print $10}'`"
if [[ "${CPU_LIMIT}" != "disabled" ]] ; then if [[ "${CPU_LIMIT}" != "disabled" ]] ; then
...@@ -2712,7 +2663,7 @@ gui_proton_downloader () { ...@@ -2712,7 +2663,7 @@ gui_proton_downloader () {
fi fi
# PROTON_LG # PROTON_LG
export PROTON_PW_GIT=($(curl -s "https://api.github.com/repos/Castro-Fidel/wine_builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) export PROTON_PW_GIT=($(curl -s "$url_cdn/metainfo"))
try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
if [[ ! -z "${PROTON_PW_GIT}" ]] ; then if [[ ! -z "${PROTON_PW_GIT}" ]] ; then
for PPWGIT in ${PROTON_PW_GIT[@]} ; do for PPWGIT in ${PROTON_PW_GIT[@]} ; do
...@@ -2728,7 +2679,7 @@ gui_proton_downloader () { ...@@ -2728,7 +2679,7 @@ gui_proton_downloader () {
/usr/bin/env bash -c ${pw_full_command_line[*]} & /usr/bin/env bash -c ${pw_full_command_line[*]} &
exit 0 exit 0
fi fi
for INSTALLING_VERSION_IN_DIST in `ls "${PORT_WINE_PATH}/data/dist/"` ; do for INSTALLING_VERSION_IN_DIST in $(ls "${PORT_WINE_PATH}/data/dist/") ; do
sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git"
sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git"
sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git"
...@@ -2816,7 +2767,8 @@ gui_proton_downloader () { ...@@ -2816,7 +2767,8 @@ gui_proton_downloader () {
print_info "Download and install ${VERSION_WINE_GIT}..." print_info "Download and install ${VERSION_WINE_GIT}..."
PW_WINE_ARCHIVE="$(echo ${URL_VERSION_PROTON_GIT} | awk -F'/' '{print $NF}' | awk -F'.tar' '{print $1}')" PW_WINE_ARCHIVE="$(echo ${URL_VERSION_PROTON_GIT} | awk -F'/' '{print $NF}' | awk -F'.tar' '{print $1}')"
if try_download_to_path "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/" ; then FILENAME="$(basename "${URL_VERSION_PROTON_GIT}")"
if try_download "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/$FILENAME" ; then
for archive_type in "gz" "xz" ; do for archive_type in "gz" "xz" ; do
if [ -f "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" ] ; then if [ -f "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" ] ; then
if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then
......
data_from_portwine/scripts/lang
View file @ f130c342
...@@ -369,8 +369,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then ...@@ -369,8 +369,8 @@ if [[ "${update_loc}" == "RUS" ]] ; then
export loc_gui_gpu_select="Выбрать видеокарту для запуска игры (в user.conf)" export loc_gui_gpu_select="Выбрать видеокарту для запуска игры (в user.conf)"
export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры (используется для всех запускаемых игр и программ в ${portname}.)" export loc_gui_gpu_select_help="Выбор какая видеокарта будет использоваться для запуска игры (используется для всех запускаемых игр и программ в ${portname}.)"
export loc_gui_check_new_wine="Проверяем новые версии WINE на GitHub" export loc_gui_check_new_wine="Проверяем новые версии WINE"
export loc_gui_check_new_wine_error="Не удается установить соединение с GitHub\nдля проверки новых версии WINE." export loc_gui_check_new_wine_error="Не удается проверить новые версии WINE."
export loc_gui_set_new_wine="Выберите версию WINE для загрузки:" export loc_gui_set_new_wine="Выберите версию WINE для загрузки:"
export loc_gui_del_wine="Выберите версию WINE для удаления:" export loc_gui_del_wine="Выберите версию WINE для удаления:"
export loc_gui_installed_wine="УСТАНОВЛЕННЫЕ" export loc_gui_installed_wine="УСТАНОВЛЕННЫЕ"
...@@ -783,8 +783,8 @@ A brief instruction: ...@@ -783,8 +783,8 @@ A brief instruction:
export loc_gui_gpu_select="Choose a graphics card to run the game (in user.conf)" export loc_gui_gpu_select="Choose a graphics card to run the game (in user.conf)"
export loc_gui_gpu_select_help="Select which video card will be used to run the game (used for all running games and programs in ${portname})" export loc_gui_gpu_select_help="Select which video card will be used to run the game (used for all running games and programs in ${portname})"
export loc_gui_check_new_wine="Check new version WINE from GitHub" export loc_gui_check_new_wine="Check new version WINE"
export loc_gui_check_new_wine_error="Error: check wine from github." export loc_gui_check_new_wine_error="Error: check wine."
export loc_gui_set_new_wine="Select WINE for download:" export loc_gui_set_new_wine="Select WINE for download:"
export loc_gui_del_wine="Select installed WINE for delete:" export loc_gui_del_wine="Select installed WINE for delete:"
export loc_gui_installed_wine="INSTALLED" export loc_gui_installed_wine="INSTALLED"
......
data_from_portwine/scripts/portwine_db/AliceMadnessReturns 0 → 100644
View file @ f130c342
#!/usr/bin/env bash
#Author: vano
#AliceMadnessReturns.exe
#Rating=5
#####################examples###########################
export PW_WINDOWS_VER="10"
export PW_NO_FSYNC="1"
export PW_NO_ESYNC="1"
export PW_USE_GSTREAMER="1"
export PW_WINE_USE="PROTON_LG_8-25-2"
export PW_FORCE_LARGE_ADDRESS_AWARE="1"
gui_proton_downloader silent "$PW_WINE_USE"
data_from_portwine/scripts/start.sh
View file @ f130c342
...@@ -21,6 +21,7 @@ fi ...@@ -21,6 +21,7 @@ fi
export PW_START_PID="$$" export PW_START_PID="$$"
export NO_AT_BRIDGE=1 export NO_AT_BRIDGE=1
export GDK_BACKEND="x11"
export pw_full_command_line=("$0" $*) export pw_full_command_line=("$0" $*)
MISSING_DESKTOP_FILE=0 MISSING_DESKTOP_FILE=0
...@@ -80,7 +81,7 @@ if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then ...@@ -80,7 +81,7 @@ if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then
orig_IFS="$IFS" orig_IFS="$IFS"
IFS=$'\n' IFS=$'\n'
for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do for dist_dir in $(ls -1 "${PORT_WINE_PATH}/data/dist/") ; do
dist_dir_new=`echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g` dist_dir_new=$(echo "${dist_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g)
if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then if [[ ! -d "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" ]] ; then
mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}" mv -- "${PORT_WINE_PATH}/data/dist/$dist_dir" "${PORT_WINE_PATH}/data/dist/${dist_dir_new^^}"
fi fi
...@@ -97,7 +98,7 @@ try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}" ...@@ -97,7 +98,7 @@ try_force_link_dir "${PORT_WINE_PATH}/data/prefixes" "${PORT_WINE_PATH}"
orig_IFS="$IFS" orig_IFS="$IFS"
IFS=$'\n' IFS=$'\n'
for pfx_dir in $(ls -1 "${PORT_WINE_PATH}/data/prefixes/") ; do for pfx_dir in $(ls -1 "${PORT_WINE_PATH}/data/prefixes/") ; do
pfx_dir_new=`echo "${pfx_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g` pfx_dir_new=$(echo "${pfx_dir}" | awk '$1=$1' | sed -e s/[[:blank:]]/_/g)
if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${pfx_dir_new^^}" ]] ; then if [[ ! -d "${PORT_WINE_PATH}/data/prefixes/${pfx_dir_new^^}" ]] ; then
mv -- "${PORT_WINE_PATH}/data/prefixes/$pfx_dir" "${PORT_WINE_PATH}/data/prefixes/${pfx_dir_new^^}" mv -- "${PORT_WINE_PATH}/data/prefixes/$pfx_dir" "${PORT_WINE_PATH}/data/prefixes/${pfx_dir_new^^}"
fi fi
...@@ -135,16 +136,13 @@ export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" ...@@ -135,16 +136,13 @@ export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}"
export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui"
export PW_GUI_THEMES_PATH="${PORT_WINE_PATH}/data/themes" export PW_GUI_THEMES_PATH="${PORT_WINE_PATH}/data/themes"
if [[ $(gsettings get org.gnome.desktop.interface color-scheme) == "'prefer-dark'" ]]
then export PW_DESKTOP_THEME="dark"
fi
. "${PORT_SCRIPTS_PATH}"/lang . "${PORT_SCRIPTS_PATH}"/lang
export urlg="https://linux-gaming.ru/portproton/" export urlg="https://linux-gaming.ru/portproton/"
export url_cdn="https://cdn.linux-gaming.ru"
export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}" export PW_WINELIB="${PORT_WINE_TMP_PATH}/libs${PW_LIBS_VER}"
try_remove_dir "${PW_WINELIB}/var" try_remove_dir "${PW_WINELIB}/var"
export install_ver=`cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1` export install_ver=$(cat "${PORT_WINE_TMP_PATH}/${portname}_ver" | head -n 1)
export WINETRICKS_DOWNLOADER="curl" export WINETRICKS_DOWNLOADER="curl"
export USER_CONF="${PORT_WINE_PATH}/data/user.conf" export USER_CONF="${PORT_WINE_PATH}/data/user.conf"
check_user_conf check_user_conf
...@@ -174,6 +172,10 @@ else ...@@ -174,6 +172,10 @@ else
echo 'export GUI_THEME="default"' >> "$USER_CONF" echo 'export GUI_THEME="default"' >> "$USER_CONF"
fi fi
if [[ $(gsettings get org.gnome.desktop.interface color-scheme) == "'prefer-dark'" ]]
then export PW_DESKTOP_THEME="dark"
fi
if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \
&& [[ ! -f "/tmp/portproton.lock" ]] && [[ ! -f "/tmp/portproton.lock" ]]
then then
......
data_from_portwine/scripts/var
View file @ f130c342
#!/usr/bin/env bash #!/usr/bin/env bash
#Author: Castro-Fidel (linux-gaming.ru) #Author: Castro-Fidel (linux-gaming.ru)
#SCRIPTS_NEXT_VERSION=2274 #SCRIPTS_NEXT_VERSION=2275
######################################################################## ########################################################################
export PW_MANGOHUD="0" export PW_MANGOHUD="0"
export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine" export DEFAULT_MANGOHUD_CONFIG="arch,cpu_mhz,cpu_temp,engine_version,gamemode,gpu_core_clock,gpu_mem_clock,gpu_name,gpu_temp,ram,resolution,vkbasalt,vram,vulkan_driver,wine"
...@@ -18,8 +18,7 @@ export PW_FORCE_USE_VSYNC="2" ...@@ -18,8 +18,7 @@ export PW_FORCE_USE_VSYNC="2"
export PW_USE_TERMINAL="0" export PW_USE_TERMINAL="0"
export PW_WINDOWS_VER="10" export PW_WINDOWS_VER="10"
export WINEARCH="win64" export WINEARCH="win64"
export PW_LIBS_VER="_v47" export PW_LIBS_VER="_v48"
export GDK_BACKEND="x11"
export PW_USE_GSTREAMER="1" export PW_USE_GSTREAMER="1"
export PW_USE_D3D_EXTRAS="1" export PW_USE_D3D_EXTRAS="1"
export PW_PREFIX_NAME="DEFAULT" export PW_PREFIX_NAME="DEFAULT"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment