diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 3cd4d79d..36e8ea14 100644 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,15 @@ You can help us in the development of the project on the website: https://boosty ----------------------------------------- Changelog: +###Scripts version 2069### +* added support for OpenSUSE (vkBasalt and MANGOHUD) +* fixed GOG installation (for OpenSUSE and Fedora) +* update plugins v.2.0: + - BattlEye_Runtime (10 January 2022) + - d3d_extras v.2.0 + - nvapi v.0.5.1 + - nvml v.0.1.1 + ###Scripts version 2068### * HOTFIX - WINE download fixed * NV_PRIME_RENDER_OFFLOAD is disabled by default (can be enabled using EDIT_DB) diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 8a94c936..e8e92068 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -6,6 +6,15 @@ * добавить выбор языка в PortProton и about us * заниматься только развитием проекта за счет вашей подписки на https://boosty.to/portwine-linux.ru ----------------------------------------- +###Scripts version 2069### +* добавлена поддержка OpenSUSE (vkBasalt и MANGOHUD) +* исправлена установка GOG (для OpenSUSE и Fedora) +* обновлен библиотеки plugins до v.2.0: + - BattlEye_Runtime (10 January 2022) + - d3d_extras v.2.0 + - nvapi v.0.5.1 + - nvml v.0.1.1 + ###Scripts version 2068### * HOTFIX - исправлено скачивание WINE * по умолчанию отключена переменная NV_PRIME_RENDER_OFFLOAD (можно включить с помощью EDIT_DB) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 6f9508fa..862a2ad5 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -404,8 +404,8 @@ pw_start_progress_bar_block () { } pw_stop_progress_bar () { - kill -s SIGUSR1 "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" \ - "$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER" > /dev/null 2>&1 + kill -s SIGUSR1 "$PW_YAD_PID_PROGRESS_BAR_BLOCK" "$PW_YAD_PID_PROGRESS_BAR_CS" > /dev/null 2>&1 + kill -s SIGUSR1 "$PW_YAD_PID_PFX_COVER_UI" "$PW_YAD_PID_PROGRESS_BAR_COVER" > /dev/null 2>&1 return 0 } export -f pw_stop_progress_bar @@ -443,7 +443,7 @@ pw_kill_autostart () { else sleep 5 while true ; do - if [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" && ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then + if [[ -z "`ps aux | grep -m 1 "$1" | grep -v grep | awk '{print $2}'`" ]] && [[ ! -z "`ps aux | grep wrap | grep -v grep | grep -i ${portname} | head -n 1`" ]] ; then echo -e "PID "$1" not found" sleep 5 else @@ -577,7 +577,7 @@ pw_tray_icon () { 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 - tray_icon_click() { + tray_icon_click () { echo "" } export -f tray_icon_click @@ -585,7 +585,7 @@ pw_tray_icon () { pw_run explorer } export -f pw_tray_winefile - tray_icon_click_exit() { + tray_icon_click_exit () { pw_stop_progress_bar stop_portwine } @@ -787,7 +787,7 @@ pw_gui_for_edit_db () { "${pw_yad_new}" --plug=$KEY_EDIT_DB_GUI --tabnum="2" --form --separator=" " --columns=1 \ --field="MANGOHUD FPS LIMIT (0-disabled):SCL" ${FPS_LIMIT_VAR} 1> "${PORT_WINE_TMP_PATH}/tmp_output_yad_fps_limit" & - "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="370" \ + "${pw_yad_new}" --paned --key="$KEY_EDIT_DB_GUI" --title "EDIT_DB" --text-align=center --height="400" \ --text "Change settings in database file for ${PORTWINE_DB}\n" --separator=" " --borders=10 --center \ --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --button="CANCEL":1 --button="OPEN DB FILE":150 --button="SAVE CHANGES":0 YAD_STATUS="$?" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_GOG b/data_from_portwine/scripts/pw_autoinstall/PW_GOG index 5cf80488..f9cb6f61 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_GOG +++ b/data_from_portwine/scripts/pw_autoinstall/PW_GOG @@ -2,33 +2,11 @@ # Author: Castro-Fidel (PortWINE-Linux.ru) ######################################################################## export LAUNCH_PARAMETERS=("/VERYSILENT") -export PW_GOG_WEB_INSTALL_EXE="${PW_USER_TEMP}/users/steamuser/Temp/GOG_Galaxy_2.0.exe" -start_portwine -if try_download_silent "https://webinstallers.gog-statics.com/download/GOG_Galaxy_2.0.exe" "${PW_GOG_WEB_INSTALL_EXE}" +export GOG_VER=2.0.45.61 +export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/setup_galaxy_${GOG_VER}.exe" +if try_download "https://content-system.gog.com/open_link/download?path=/open/galaxy/client/${GOG_VER}/setup_galaxy_${GOG_VER}.exe" "${PW_AUTOINSTALL_EXE}" then - pw_kill_autostart GalaxyInstaller.exe & - pw_kill_autostart GOG_Galaxy_2.0.exe & - # while true; do - # if [ -z `ps -Ao pid,cmd | grep -v grep | grep GalaxyInstaller.exe | awk '{print $1}'` ]; then - # sleep 1 - # else - # [ `ps -Ao pid,cmd | grep -v grep | grep -E ${PW_GOG_WEB_INSTALL_EXE} | tail -n 1 | awk '{print $1}'` ] - # kill -s KILL `ps -Ao pid,cmd | grep -v grep | grep -E ${PW_GOG_WEB_INSTALL_EXE} | tail -n 1 | awk '{print $1}'` - # [ -z `ps -Ao pid,cmd | grep -v grep | grep GalaxyInstaller.exe | awk '{print $1}'` ] - # killall -s KILL "GalaxyInstaller.exe" - # break - # fi - # done & pw_start_progress_bar_block "Installing the GOG Galaxy. Please wait..." - pw_run "${PW_GOG_WEB_INSTALL_EXE}" - if [ -f "${PW_USER_TEMP}/users/steamuser/Temp/GalaxyInstaller_"*"/remoteconfig.json" ] ; then - export PW_GOG_URL_EXE=$(cat "${PW_USER_TEMP}/users/steamuser/Temp/GalaxyInstaller_"*"/remoteconfig.json" | grep -Eo '[[:alnum:]+\.\_\-\/\=\?\:\-]*.exe' | sed s%'\\'%%g ) - fi -fi -export PW_AUTOINSTALL_EXE="`echo ${PW_USER_TEMP}/${PW_GOG_URL_EXE} | awk -F/ '{print $NF}'`" -echo "${PW_AUTOINSTALL_EXE}" -if try_download "${PW_GOG_URL_EXE}" "${PW_AUTOINSTALL_EXE}" -then pw_run "${PW_AUTOINSTALL_EXE}" portwine_exe="$WINEPREFIX/drive_c/Program Files (x86)/GOG Galaxy/GalaxyClient.exe" try_remove_file "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index cec2e173..e5223272 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -37,13 +37,25 @@ start_portwine () { pw_update_pfx_cover_gui + if [[ ! -z "`cat /etc/*-release | grep -i opensuse`" ]] || [[ ! -z "`cat /etc/*-release | grep -i centos`" ]] ; then + if check_symlink "${PW_WINELIB}/portable/lib/lib64" ; then + rm -fr "${PW_WINELIB}/portable/lib/lib64" + fi + if [[ ! -d "${PW_WINELIB}/portable/lib/lib64" ]] ; then + mv -f "${PW_WINELIB}/portable/lib/lib" "${PW_WINELIB}/portable/lib/lib64" + fi + if [[ ! -d "${PW_WINELIB}/portable/lib/lib" ]] ; then + mv -f "${PW_WINELIB}/portable/lib/lib32" "${PW_WINELIB}/portable/lib/lib" + fi + fi if [[ ! -z "${LD_LIBRARY_PATH}" ]] ; then if [[ -z "`echo ${LD_LIBRARY_PATH} | grep "${WINEDIR}/lib64:${WINEDIR}/lib"`" ]] ; then export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/\$LIB:${LD_LIBRARY_PATH}" fi - else + else export LD_LIBRARY_PATH="${WINEDIR}/lib64:${WINEDIR}/lib:${PW_WINELIB}/portable/lib/\$LIB" fi + if [[ ! -z "${VK_LAYER_PATH}" ]] then export VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d/:${VK_LAYER_PATH}" else export VK_LAYER_PATH="${PW_WINELIB}/portable/share/vulkan/implicit_layer.d/" @@ -324,9 +336,11 @@ start_portwine () { try_force_link_file "${PW_PLUGINS_PATH}"/BattlEye_Runtime/BEClient_x64.so "${WINEDIR}"/lib64 var_winedlloverride_update "beclient,beclient_x64=b,n" #try link d3d extras libs - for d3d_extras_from_plugins in d3dcompiler_43 d3dx9_27 d3dx9_32 d3dx9_37 d3dx9_42 d3dcompiler_47 d3dx9_28 \ - d3dx9_33 d3dx9_38 d3dx9_43 d3dx9_24 d3dx9_29 d3dx9_34 d3dx9_39 d3dx9_25 d3dx9_30 d3dx9_35 d3dx9_40 d3dx9_26 \ - d3dx9_31 d3dx9_36 d3dx9_41 + for d3d_extras_from_plugins in d3dcompiler_33 d3dcompiler_34 d3dcompiler_35 d3dcompiler_36 d3dcompiler_37 \ + d3dcompiler_38 d3dcompiler_39 d3dcompiler_40 d3dcompiler_41 d3dcompiler_42 d3dcompiler_43 d3dcompiler_46 \ + d3dcompiler_47 d3dx10_33 d3dx10_34 d3dx10_35 d3dx10_36 d3dx10_37 d3dx10_38 d3dx10_39 d3dx10_40 d3dx10_41 \ + d3dx10_42 d3dx10_43 d3dx10 d3dx11_42 d3dx11_43 d3dx9_24 d3dx9_25 d3dx9_26 d3dx9_27 d3dx9_28 d3dx9_29 d3dx9_30 \ + d3dx9_31 d3dx9_32 d3dx9_33 d3dx9_34 d3dx9_35 d3dx9_36 d3dx9_37 d3dx9_38 d3dx9_39 d3dx9_40 d3dx9_41 d3dx9_42 d3dx9_43 do try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x64/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/system32/" try_force_link_file "${PW_PLUGINS_PATH}/d3d_extras/x32/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" @@ -461,7 +475,7 @@ start_portwine () { wait_wineserver && echo "Set to win${PW_WINDOWS_VER}" fi - pw_stop_progress_bar && + pw_stop_progress_bar pw_tray_icon pw_start_progress_bar_cover "${PW_GUI_ICON_PATH}/covers/pw_loading_cover.gif" add_in_start_portwine diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index b12ab649..fb8abc70 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/bin/bash #Author: Castro-Fidel (PortWINE-Linux.ru) -#SCRIPTS_NEXT_VERSION=2068 +#SCRIPTS_NEXT_VERSION=2069 #PORT_NEXT_VERSION=97 ######################################################################## export PW_MANGOHUD=1 @@ -33,7 +33,7 @@ export WINEPREFIX="${PORT_WINE_PATH}/data/pfx" export WINE_WIN_START="start.exe /i /unix" ###DEFAULT_WINE### export PW_WINE_USE=PROTON_GE -export PW_PLUGINS_VER="_v1" +export PW_PLUGINS_VER="_v2" ###WINE_PROTON_STEAM### export PW_STEAM_VER="6.3-8C_PW2" export PW_PROTON_STEAM_VER="PROTON_STEAM_${PW_STEAM_VER}"