###Scripts version 1105###
This commit is contained in:
parent
295d028ba7
commit
62651c1d93
@ -1,8 +1,6 @@
|
||||
История изменений и дальнейшие планы:
|
||||
-----------------------------------------
|
||||
В планах:
|
||||
* иконка в трей для PortProton (перенести reset в GUI PortProton)
|
||||
* обновление скриптов перед проверкой актуальности версии libs
|
||||
* создать ветку beta на github и сделать выбор версии внутри порта
|
||||
* добавить фикс установки dotnet
|
||||
* добавить кнопку очистки префикса в PortProton
|
||||
@ -10,10 +8,15 @@
|
||||
* EDIT DB открывается не у всех
|
||||
* пересоздать удаление PortProton (чистка ярлыков в меню с помощью grep "путь до порта")
|
||||
* добавить контроль за окнами для правильного отключения прогресс бара
|
||||
* зарабатывать на жизнь развитием проекта с помощью вашей подписки на https://boosty.to/portwine-linux.ru
|
||||
* заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru
|
||||
-----------------------------------------
|
||||
###Scripts version 1105###
|
||||
* для распаковки exe файлов при автоматических установках лаунчеров используется 7z вместо 7zr
|
||||
* обновлен DXVK до версии 1.9
|
||||
* исправлена автоматическая установка GOG
|
||||
* автоматическое создание символьной ссылки users/steamuser/Documents в users/steamuser/My Documents
|
||||
* добавлена иконка в трей для PortProton (завершение всех процессов по ПКМ --> "FORCE EXIT")
|
||||
* добавлена возможность запуска нескольких приложений одновременно и закрывать всё одним нажатием ПКМ --> EXIT
|
||||
|
||||
###Scripts version 1104###
|
||||
* крупное обновлеение контейнера (libs_v16):
|
||||
|
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10_1.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10_1.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10core.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d10core.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d11.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d11.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d9.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/d3d9.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib/wine/dxvk/dxgi.dll
vendored
BIN
data_from_portwine/dist/lib/wine/dxvk/dxgi.dll
vendored
Binary file not shown.
@ -1 +1 @@
|
||||
01033af9a4c76c0c9bf9182fcefa31cddd29d2cd dxvk (v1.8.1-140-g01033af9)
|
||||
v1.9
|
||||
|
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d10.dll
vendored
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d10.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d10_1.dll
vendored
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d10_1.dll
vendored
Binary file not shown.
Binary file not shown.
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d11.dll
vendored
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d11.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d9.dll
vendored
BIN
data_from_portwine/dist/lib64/wine/dxvk/d3d9.dll
vendored
Binary file not shown.
BIN
data_from_portwine/dist/lib64/wine/dxvk/dxgi.dll
vendored
BIN
data_from_portwine/dist/lib64/wine/dxvk/dxgi.dll
vendored
Binary file not shown.
@ -1 +1 @@
|
||||
01033af9a4c76c0c9bf9182fcefa31cddd29d2cd dxvk (v1.8.1-140-g01033af9)
|
||||
v1.9
|
||||
|
@ -109,15 +109,15 @@ PW_EPIC () {
|
||||
}
|
||||
|
||||
PW_GOG () {
|
||||
export LAUNCH_PARAMETERS=("/runWithoutUpdating" "/deelevated" )
|
||||
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/OriginSetup.exe"
|
||||
export LAUNCH_PARAMETERS=("/VERYSILENT")
|
||||
export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_2.0.37.384.exe"
|
||||
START_PORTWINE
|
||||
if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/2.0.35.19/setup_galaxy_2.0.35.19a.exe" "${PW_AUTOINSTALL_EXE}"
|
||||
if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/2.0.37.384/setup_galaxy_2.0.37.384.exe" "${PW_AUTOINSTALL_EXE}"
|
||||
then
|
||||
PW_START_PROGRESS_BAR_CS "Installing the GOG Galaxy. Please wait..."
|
||||
pw_kill_autostart GalaxyClient.exe &
|
||||
PW_START_PROGRESS_BAR_BLOCK "Installing the GOG Galaxy. Please wait..."
|
||||
pw_kill_autostart GalaxyClient.* &
|
||||
PW_RUN "${PW_AUTOINSTALL_EXE}"
|
||||
portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "GalaxyClient.exe"`
|
||||
portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClient.exe"
|
||||
try_remove_file "${PW_AUTOINSTALL_EXE}"
|
||||
KILL_PORTWINE
|
||||
PW_STOP_PROGRESS_BAR
|
||||
|
@ -207,6 +207,7 @@ PW_LOAD_LIBS () {
|
||||
fi
|
||||
fi
|
||||
export pw_yad="${PW_WINELIB}/runtime/bin/yad"
|
||||
export pw_yad_new="${PW_WINELIB}/runtime/bin/yad_new"
|
||||
export pw_zstd="${PW_WINELIB}/runtime/bin/zstd"
|
||||
export pw_7z="${PW_WINELIB}/runtime/lib/p7zip/7z"
|
||||
if [ -x "`which xterm 2>/dev/null`" ]; then
|
||||
@ -269,8 +270,33 @@ PW_DOWNLOAD_GECKO () {
|
||||
fi
|
||||
fi
|
||||
}
|
||||
START_PORTWINE ()
|
||||
{
|
||||
PW_TRAY_ICON () {
|
||||
if [ -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ] ; then
|
||||
tray_icon_click() {
|
||||
echo ""
|
||||
}
|
||||
export -f tray_icon_click
|
||||
tray_icon_click_exit() {
|
||||
KILL_PORTWINE
|
||||
if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ]
|
||||
then kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`"
|
||||
fi
|
||||
}
|
||||
export -f tray_icon_click_exit
|
||||
|
||||
"${pw_yad_new}" --notification --no-middle --text="PortProton" \
|
||||
--window-icon="$PW_GUI_ICON_PATH/port_proton.png" \
|
||||
--image="$PW_GUI_ICON_PATH/port_proton.png" \
|
||||
--command="bash -c tray_icon_click" \
|
||||
--tooltip="PortProton" \
|
||||
--menu="| \
|
||||
<<< CHANGE LOG >>>!bash -c open_changelog!texture| \
|
||||
--------------------------------------| \
|
||||
<<< FORCE EXIT >>>!bash -c tray_icon_click_exit!exit|"
|
||||
fi
|
||||
}
|
||||
START_PORTWINE () {
|
||||
PW_TRAY_ICON &
|
||||
if [ -x "`which konsole 2>/dev/null`" ]; then export PW_TERM="konsole --nofork -e"
|
||||
# elif [ -x "`which gnome-terminal 2>/dev/null`" ]; then export PW_TERM="gnome-terminal -- /bin/bash" ???
|
||||
elif [ -x "`which lxterminal 2>/dev/null`" ]; then export PW_TERM="lxterminal -e"
|
||||
@ -489,6 +515,7 @@ KILL_PORTWINE () {
|
||||
kill -n 9 `pgrep -a bwrap | grep ${portname} | head -n 1 | awk '{print $1}'`
|
||||
fi
|
||||
}
|
||||
export -f KILL_PORTWINE
|
||||
|
||||
STOP_PORTWINE () {
|
||||
WAIT_WINESERVER
|
||||
@ -502,6 +529,10 @@ STOP_PORTWINE () {
|
||||
PW_STOP_PROGRESS_BAR
|
||||
try_remove_file "${PORT_SCRIPTS_PATH}/0"
|
||||
try_remove_file "${PORT_SCRIPTS_PATH}/1"
|
||||
KILL_PORTWINE
|
||||
if [ ! -z "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`" ]
|
||||
then kill -s SIGUSR1 "`pgrep -a yad_new | grep "\-\-notification" | awk '{print $1}'`"
|
||||
fi
|
||||
}
|
||||
|
||||
UPDATE_WINETRICKS () {
|
||||
@ -690,11 +721,12 @@ PW_INIT_PFX () {
|
||||
if [ ! -d "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}" ]; then
|
||||
try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/users/steamuser" "${PORT_WINE_PATH}/data/pfx/drive_c/users/${USER}"
|
||||
fi
|
||||
if [ ! -d "${PORT_WINE_PATH}/drive_c" ]; then
|
||||
try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/"
|
||||
fi
|
||||
[ ! -d "${PORT_WINE_PATH}/drive_c" ] && try_force_link_dir "${PORT_WINE_PATH}/data/pfx/drive_c/" "${PORT_WINE_PATH}/"
|
||||
create_new_dir "${WINEPREFIX}/drive_c/users/Public/Documents/Steam"
|
||||
create_new_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents/Steam"
|
||||
if [ ! -d "${WINEPREFIX}/drive_c/users/steamuser/My Documents" ]
|
||||
then try_force_link_dir "${WINEPREFIX}/drive_c/users/steamuser/Documents" "${WINEPREFIX}/drive_c/users/steamuser/My Documents"
|
||||
fi
|
||||
var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n"
|
||||
|
||||
# export TOTAL_VRAM=`"${PW_WINELIB}/runtime/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'`
|
||||
@ -834,7 +866,7 @@ PW_RUN () {
|
||||
fi
|
||||
fi
|
||||
}
|
||||
#####MAIN#####
|
||||
###MAIN###
|
||||
cd "$(dirname "`readlink -f "$0"`")" && export PORT_SCRIPTS_PATH="$(pwd)"
|
||||
cd "${PORT_SCRIPTS_PATH}/../../" && export PORT_WINE_PATH="$(pwd)"
|
||||
export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp"
|
||||
|
@ -7,7 +7,6 @@ fi
|
||||
. "$(dirname $(readlink -f "$0"))/runlib"
|
||||
|
||||
PORTWINE_LAUNCH () {
|
||||
KILL_PORTWINE
|
||||
START_PORTWINE
|
||||
PORTWINE_MSI=`basename "${portwine_exe}" | grep .msi`
|
||||
PORTWINE_BAT=`basename "${portwine_exe}" | grep .bat`
|
||||
@ -212,6 +211,7 @@ PW_AUTO_INSTALL_FROM_DB () {
|
||||
. "$PORT_SCRIPTS_PATH/autoinstall"
|
||||
$PW_YAD_SET
|
||||
}
|
||||
###MAIN###
|
||||
if [ ! -z "${portwine_exe}" ]; then
|
||||
if [ -z "${PW_GUI_DISABLED_CS}" ] || [ "${PW_GUI_DISABLED_CS}" = 0 ] || [ -z "${PW_VULKAN_USE}" ]; then
|
||||
if [ ! -z "${PORTWINE_DB_FILE}" ] && [ ! -z "${PW_VULKAN_USE}" ]; then
|
||||
|
Loading…
Reference in New Issue
Block a user