From 467caf6a5eae9699ac2f3794b144a413a5fa2bff Mon Sep 17 00:00:00 2001 From: Mikhail Tergoev Date: Wed, 27 Mar 2024 18:02:50 +0300 Subject: [PATCH] Scripts version 2267 --- data_from_portwine/changelog_eng | 5 ++ data_from_portwine/changelog_rus | 5 ++ .../scripts/portwine_db/Battle.net_Launcher | 1 + .../scripts/pw_autoinstall/PW_BATTLE_NET | 3 +- data_from_portwine/scripts/runlib | 60 +++++++++--------- data_from_portwine/scripts/start.sh | 1 - data_from_portwine/scripts/var | 4 +- data_from_portwine/scripts/yad_gui | 62 ++++++++++--------- 8 files changed, 78 insertions(+), 63 deletions(-) diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 53a24d6..a493835 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,11 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2267### Date: 27.03.2024 / Download update size: 15 megabytes +* implemented a twofold acceleration of prefix updates on all systems +* improved the functionality of settings for exe files (EDIT_DB) +* fixed the automatic installation of BattleNET + ###Scripts version 2266### Date: 26.03.2024 / Download update size: 185 megabytes * HOTFIX - download plugins from GITHUB diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 3fcc138..8604535 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,11 @@ ----------------------------------------- История изменений: +###Scripts version 2267### Дата: 27.03.2024 / Размер скачиваемого обновления: 15 мегабайт +* реализовано двухкратное ускорение обновления префикса на всех системах +* улучшен функционал настроек для exe файлов (EDIT_DB) +* исправлена автоустановка BattleNET + ###Scripts version 2266### Дата: 26.03.2024 / Размер скачиваемого обновления: 170 мегабайт * HOTFIX - исправлен баг гитхаба при доступе к plugins diff --git a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher index f5f0cb9..d29cb9b 100755 --- a/data_from_portwine/scripts/portwine_db/Battle.net_Launcher +++ b/data_from_portwine/scripts/portwine_db/Battle.net_Launcher @@ -12,6 +12,7 @@ export PW_DLL_INSTALL="vcrun2019 d3dx11_42 d3dx11_43" export PW_WINDOWS_VER=10 export PW_WINE_FULLSCREEN_FSR="0" export PW_USE_EAC_AND_BE="0" +export PW_WINE_USE="PROTON_LG" add_in_start_portwine () { rm -fr "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/ProgramData/Agent/data" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET index d2c00ca..5f49d66 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET +++ b/data_from_portwine/scripts/pw_autoinstall/PW_BATTLE_NET @@ -3,14 +3,15 @@ ######################################################################## [ "${update_loc}" = "RUS" ] && export BN_LOC=ruRU || export BN_LOC=enUS export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/Battle.net-Setup-${BN_LOC}.exe" +export PW_WINE_USE="WINE_LG" start_portwine if try_download_no_mirror "https://battle.net/download/getInstallerForGame?os=win&version=LIVE&gameProgram=BATTLENET_APP" "${PW_AUTOINSTALL_EXE}" then - # PW_START_PROGRESS_BAR "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} " try_remove_dir "$WINEPREFIX/drive_c/ProgramData/Battle.net" pw_kill_autostart Battle.net.exe & pw_run "${PW_AUTOINSTALL_EXE}" + pw_start_progress_bar_block "${loc_gui_installing_the} Battle Net. ${loc_gui_please_wait} " portwine_exe=`find "$WINEPREFIX/drive_c/" -type f -name "Battle.net.exe" | grep "Battle.net/Battle.net.exe"` pw_stop_progress_bar portwine_create_shortcut diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index fa74bd5..e5abcb4 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -71,8 +71,16 @@ start_portwine () { fi pw_wineboot () { + LIST_RM_WIN_DLL="winevulkan amd_ags_x64 ir50_32 atl100 ntdll \ +libvkd3d-1 libvkd3d-shader-1 dxvk_config nvapi nvapi64 d3d12core d3d12 \ +d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d vulkan-1" + for rm_win_dll in $LIST_RM_WIN_DLL ; do + try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${rm_win_dll}.dll" + try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${rm_win_dll}.dll" + done print_info "Used wineboot $@ for prefix: ${PW_PREFIX_NAME}" ${pw_runtime} env GST_PLUGIN_SYSTEM_PATH_1_0="" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" \ + WINEDEBUG="fixme-all,err+loaddll,err+dll,err+file,err+reg" \ "${WINELOADER}" wineboot $@ &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" wait_wineserver print_info "The prefix has been updated." @@ -88,12 +96,12 @@ start_portwine () { if [[ "${PW_PREFIX_NAME}" == DEFAULT ]] ; then pw_update_pfx_cover_gui unpack_tar_xz "${PW_PLUGINS_PATH}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" silent - pw_wineboot -u + pw_wineboot -r elif [[ "${PW_CHECK_AUTOINSTAL}" == 1 ]] \ && [[ "${DISABLE_CP_DEFPFX}" != 1 ]] ; then pw_update_pfx_cover_gui unpack_tar_xz "${PW_PLUGINS_PATH}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" silent - pw_wineboot -u + pw_wineboot -r elif [[ "${PW_CHECK_AUTOINSTAL}" == 1 ]] \ && [[ "${DISABLE_CP_DEFPFX}" == 1 ]] ; then pw_update_pfx_cover_gui @@ -101,7 +109,7 @@ start_portwine () { elif yad_question "$loc_gui_dll_new_pfx ${PW_PREFIX_NAME}" ; then pw_update_pfx_cover_gui unpack_tar_xz "${PW_PLUGINS_PATH}/default_pfx.tar.xz" "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/" silent - pw_wineboot -u + pw_wineboot -r else pw_update_pfx_cover_gui pw_wineboot -i @@ -116,7 +124,7 @@ start_portwine () { if echo "$portwine_exe" | grep -i vkplay &>/dev/null then pw_kill_autostart GameCe 5 please & : fi - pw_wineboot -u + pw_wineboot -r fi fi echo "${PW_WINE_USE}" > "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/.wine_ver" @@ -409,15 +417,6 @@ start_portwine () { try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${d3d_extras_from_plugins}.dll" "${WINEPREFIX}/drive_c/windows/system32/" done fi - print_info "Try link wine d3d files by default..." - for rm_vulkan_dll in libvkd3d-1 libvkd3d-shader-1 dxvk_config nvapi nvapi64 d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d ; do - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${rm_vulkan_dll}.dll" - try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${rm_vulkan_dll}.dll" - done - for wine_build_dll in d3d12core d3d12 d3d11 d3d10 d3d10core d3d10_1 d3d9 d3d8 dxgi wined3d ; do - try_force_link_file "${WINEDIR}/lib/wine/i386-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/syswow64/" - try_force_link_file "${WINEDIR}/lib64/wine/x86_64-windows/${wine_build_dll}.dll" "${WINEPREFIX}/drive_c/windows/system32/" - done create_new_dir "${PW_VULKAN_DIR}/opengl" PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/opengl" @@ -482,13 +481,13 @@ start_portwine () { fi check_variables VKD3D_FEATURE_LEVEL "12_0" if [[ "${PW_VULKAN_USE}" == "1" ]] ; then - PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" - PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" + export PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_STABLE_VER}" + export PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_STABLE_VER}" print_info "DXVK v.${DXVK_STABLE_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_STABLE_VER} in use" elif [[ "${PW_VULKAN_USE}" == "2" ]] ; then - PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" - PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" + export PATH_TO_DXVK_FILES="${PW_VULKAN_DIR}/dxvk-${DXVK_GIT_VER}" + export PATH_TO_VKD3D_FILES="${PW_VULKAN_DIR}/vkd3d-proton-${VKD3D_GIT_VER}" print_info "DXVK v.${DXVK_GIT_VER} in use" print_info "VKD3D-PROTON v.${VKD3D_GIT_VER} in use" fi @@ -562,17 +561,6 @@ start_portwine () { export WINE_CPU_TOPOLOGY="${PW_WINE_CPU_TOPOLOGY}" fi - for try_cp_dll_from_wine in "ntdll.dll" "vulkan-1.dll" "winevulkan.dll" "amd_ags_x64.dll" "ir50_32.dll" ; do - try_remove_file "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" - if try_copy_file "${WINEDIR}/lib/wine/i386-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/syswow64/${try_cp_dll_from_wine}" - then print_info "Try copy $try_cp_dll_from_wine to syswow64... OK." - fi - try_remove_file "${WINEPREFIX}/drive_c/windows/system32/${try_cp_dll_from_wine}" - if try_copy_file "${WINEDIR}/lib64/wine/x86_64-windows/${try_cp_dll_from_wine}" "${WINEPREFIX}/drive_c/windows/system32/${try_cp_dll_from_wine}" - then print_info "Try copy $try_cp_dll_from_wine to system32... OK." - fi - done - #run_winetricks_from_db if [[ ! -z "${PW_MUST_HAVE_DLL}" ]] then export PW_DLL_INSTALL="`echo "${PW_MUST_HAVE_DLL} ${PW_DLL_INSTALL}" | awk '{ for(i=1;i<=NF;i++){a[$i]++} }END{ for(i in a){printf("%s ",i)} }' `" @@ -687,6 +675,8 @@ pw_run () { fi echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" + [[ -f "${PORT_WINE_TMP_PATH}/update_pfx_log" ]] && cat "${PORT_WINE_TMP_PATH}/update_pfx_log" >> "${PW_LOG_TO_FILE}" + echo "-" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "" print_info "Log from RUNTIME and WINE:" @@ -709,7 +699,6 @@ pw_run () { fi echo "" echo "Log WINE:" > "${PW_LOG_TO_FILE}" - print_info "Log from RUNTIME and WINE:" ${PW_RUN_GAMESCOPE} \ ${pw_runtime} \ env PATH="${PATH}" \ @@ -720,7 +709,12 @@ pw_run () { ${PW_GAMEMODERUN_SLR} \ ${PW_MANGOHUD_SLR} \ "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" + print_info "Update prefix log:" + [[ -f "${PORT_WINE_TMP_PATH}/update_pfx_log" ]] && cat "${PORT_WINE_TMP_PATH}/update_pfx_log" + echo + print_info "Log from RUNTIME and WINE:" cat "${PW_LOG_TO_FILE}" + echo fi else if [[ "${PW_LOG}" == 1 ]] ; then @@ -733,6 +727,8 @@ pw_run () { fi echo "WINEDLLOVERRIDES=${WINEDLLOVERRIDES}" >> "${PW_LOG_TO_FILE}" echo "------------------------------------" >> "${PW_LOG_TO_FILE}" + [[ -f "${PORT_WINE_TMP_PATH}/update_pfx_log" ]] && cat "${PORT_WINE_TMP_PATH}/update_pfx_log" >> "${PW_LOG_TO_FILE}" + echo "-" >> "${PW_LOG_TO_FILE}" echo "Log WINE:" >> "${PW_LOG_TO_FILE}" echo "" print_info "Log WINE:" @@ -742,6 +738,8 @@ pw_run () { "${WINELOADER}" "$@" ${LAUNCH_PARAMETERS[@]} &>>"${PW_LOG_TO_FILE}" wait_wineserver else + print_info "Update prefix log:" + [[ -f "${PORT_WINE_TMP_PATH}/update_pfx_log" ]] && cat "${PORT_WINE_TMP_PATH}/update_pfx_log" echo "" echo "Log WINE:" > "${PW_LOG_TO_FILE}" print_info "Log WINE:" @@ -784,6 +782,7 @@ unset PW_CHECK_AUTOINSTAL PW_VKBASALT_EFFECTS PW_VKBASALT_FFX_CAS PORTWINE_DB PO unset CHK_SYMLINK_FILE MESA_GL_VERSION_OVERRIDE PATH_TO_GAME PW_START_DEBUG PORTPROTON_NAME PORTWINE_CREATE_SHORTCUT_NAME FLATPAK_IN_USE unset PW_PREFIX_NAME WINEPREFIX VULKAN_MOD PW_WINE_VER PW_ADD_TO_ARGS_IN_RUNTIME PW_GAMEMODERUN_SLR AMD_VULKAN_ICD PW_WINE_CPU_TOPOLOGY unset PW_NAME_D_NAME PW_NAME_D_ICON PW_NAME_D_EXEC PW_EXEC_FROM_DESKTOP PW_ALL_DF PW_GENERATE_BUTTONS PW_NAME_D_ICON PW_NAME_D_ICON_48 +unset MANGOHUD_CONFIG export portname=PortProton @@ -830,7 +829,6 @@ create_new_dir "${PORT_WINE_TMP_PATH}"/mono export PW_VULKAN_DIR="${PORT_WINE_TMP_PATH}/VULKAN" create_new_dir "${PW_VULKAN_DIR}" - export LSPCI_VGA="$(lspci -k | grep -E 'VGA|3D' | tr -d '\n')" if command -v xrandr &>/dev/null ; then @@ -861,6 +859,8 @@ export USER_CONF="${PORT_WINE_PATH}/data/user.conf" check_user_conf check_variables PW_LOG "0" +try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" + if [[ -z "${INSTALLING_PORT}" ]] ; then . "${USER_CONF}" if [[ "${SKIP_CHECK_UPDATES}" != 1 ]] \ diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 6d644fc..2b70fa6 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -419,7 +419,6 @@ pw_winetricks () { --auto-close --skip-taskbar --width=$PW_GIF_SIZE_X --height=$PW_GIF_SIZE_Y 2>/dev/null & ${pw_runtime} env PATH="${PATH}" LD_LIBRARY_PATH="${PW_LD_LIBRARY_PATH}" GST_PLUGIN_SYSTEM_PATH_1_0="" \ "${PORT_WINE_TMP_PATH}/winetricks" -q -r -f ${PW_DLL_NEED_INSTALL} &>>"${PORT_WINE_TMP_PATH}/update_pfx_log" - try_remove_file "${PORT_WINE_TMP_PATH}/update_pfx_log" kill -s SIGTERM "$(pgrep -a yad_v12_3 | grep "title=WINETRICKS" | awk '{print $1}')" > /dev/null 2>&1 stop_portwine } diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index f7b619d..43a984b 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,9 +1,9 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2266 +#SCRIPTS_NEXT_VERSION=2267 ######################################################################## export PW_MANGOHUD="0" -export DEFAULT_MANGOHUD_CONFIG="cpu_stats,cpu_temp,cpu_mhz,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,vram,ram,frame_timing=1,time,arch,wine,toggle_hud=Shift_R+F12,resolution,vkbasalt,gamemode" +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 PW_VKBASALT_EFFECTS="Curves:cas" export PW_VKBASALT_FFX_CAS="0.66" export ENABLE_VKBASALT=1 diff --git a/data_from_portwine/scripts/yad_gui b/data_from_portwine/scripts/yad_gui index 5ad4a13..edd8d8c 100755 --- a/data_from_portwine/scripts/yad_gui +++ b/data_from_portwine/scripts/yad_gui @@ -266,12 +266,12 @@ pw_gui_for_edit_db () { export SKIP_CHECK_UPDATES=1 case "$YAD_STATUS" in 1) - /usr/bin/env bash -c "${pw_full_command_line[*]}" & + /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 ;; 2) try_remove_file "$portwine_exe".ppdb - /usr/bin/env bash -c "${pw_full_command_line[*]}" & + /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 ;; 252) @@ -307,13 +307,19 @@ pw_gui_for_edit_db () { fi echo "pw_gui_for_edit_db PORTWINE_DB_FILE=$PORTWINE_DB_FILE" edit_db_from_gui $@ LAUNCH_PARAMETERS PW_WINDOWS_VER PW_DLL_INSTALL WINEDLLOVERRIDES PW_WINE_CPU_TOPOLOGY GAMESCOPE_ARGS + if [[ -z "$MANGOHUD_CONFIG" ]] ; then + MONITOR_HEIGHT="$(echo $PW_SCREEN_RESOLUTION | awk -F'x' '{print $2}')" + MH_FONT_SIZE="font_size=$(( MONITOR_HEIGHT / 45 ))" + MANGOHUD_CONFIG="$DEFAULT_MANGOHUD_CONFIG,$MH_FONT_SIZE" + edit_db_from_gui MANGOHUD_CONFIG + fi edit_user_conf_from_gui PW_GPU_USE # PW_AMD_VULKAN_USE case "$YAD_STATUS" in 0) print_info "Restarting PP after update ppdb file..." - /usr/bin/env bash -c "${pw_full_command_line[*]}" & + /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 ;; 150) @@ -334,7 +340,7 @@ gui_proton_downloader () { return 0 fi pw_start_progress_bar_block "$loc_gui_check_new_wine" - #PROTON_GE + # PROTON_GE export PROTON_GE_GIT=($(curl -s "https://api.github.com/repos/GloriousEggroll/proton-ge-custom/releases" | grep "browser_download_url.*\.tar\.gz" | cut -d \" -f 4)) try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" if [[ ! -z "${PROTON_GE_GIT}" ]] ; then @@ -345,18 +351,18 @@ gui_proton_downloader () { sed -i '/github-action/d' "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" fi - #WINE_KRON4EK - export WINE_KRON4EK=($(curl -s "https://api.github.com/repos/Kron4ek/Wine-Builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - if [[ ! -z "${WINE_KRON4EK}" ]] ; then - for PGEGIT in ${WINE_KRON4EK[@]} ; do - echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - done - sed -i '/6.3/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - sed -i '/-x86/d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" - fi + # WINE_KRON4EK + # export WINE_KRON4EK=($(curl -s "https://api.github.com/repos/Kron4ek/Wine-Builds/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) + # try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + # if [[ ! -z "${WINE_KRON4EK}" ]] ; then + # for PGEGIT in ${WINE_KRON4EK[@]} ; do + # echo ${PGEGIT} | awk -F/ '{print $NF}' | sed 's/.tar.xz//' >> "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + # done + # sed -i '/6.3/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + # sed -i '/-x86/d' "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + # fi - #WINE_GE_CUSTOM + # WINE_GE_CUSTOM export WINE_GE_CUSTOM=($(curl -s "https://api.github.com/repos/GloriousEggroll/wine-ge-custom/releases" | grep "browser_download_url.*\.tar\.xz" | cut -d \" -f 4)) try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" if [[ ! -z "${WINE_GE_CUSTOM}" ]] ; then @@ -366,7 +372,7 @@ gui_proton_downloader () { sed -i '/6.23/,$d' "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 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)) try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" if [[ ! -z "${PROTON_PW_GIT}" ]] ; then @@ -386,33 +392,33 @@ gui_proton_downloader () { 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_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" sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" done - #Installed wine + # Installed wine ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine if [[ "$1" != "silent" ]] ; then - #GUI + # GUI export KEY_WINE=$RANDOM try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" + # try_remove_file "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" `"${pw_yad}" --plug=$KEY_WINE --tabnum=1 --list --separator="" --listen \ --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" 2>/dev/null` & + # `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \ + # --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" 1> "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" 2>/dev/null` & `"${pw_yad}" --plug=$KEY_WINE --tabnum=2 --list --separator="" --listen \ - --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" 1> "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" 2>/dev/null` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \ --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" 1> "${PORT_WINE_TMP_PATH}/tmp_proton_set" 2>/dev/null` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --list --separator="" --listen \ + `"${pw_yad}" --plug=$KEY_WINE --tabnum=3 --list --separator="" --listen \ --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" 2>/dev/null` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \ + `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --list --separator="" --listen \ --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" 2>/dev/null` & `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center \ --window-icon="$PW_GUI_ICON_PATH/portproton.svg" --title "WINE MANAGER" --separator="" \ - --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" 2>/dev/null` + --tab-pos=top --tab="PROTON-LG" --tab="PROTON-GE" --tab="WINE-GE-CUSTOM" --tab="$loc_gui_installed_wine" 2>/dev/null` YAD_WINE_STATUS="$?" if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then export SKIP_CHECK_UPDATES=1 @@ -424,8 +430,6 @@ gui_proton_downloader () { export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" | awk '{print $1}'` ] ; then export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set"`" - elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set" | awk '{print $1}'` ] ; then - export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_kron4ek_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" | awk '{print $1}'` ] ; then export VERSION_WINE_GIT="`cat "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"`" elif [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" | awk '{print $1}'` ] ; then @@ -438,7 +442,7 @@ gui_proton_downloader () { fi try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_git" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" + # try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_kron4ek_git" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine" @@ -688,7 +692,7 @@ gui_MangoHud () { edit_db_from_gui MANGOHUD_CONFIG PW_MANGOHUD FPS_LIMIT export SKIP_CHECK_UPDATES=1 - /usr/bin/env bash -c "${pw_full_command_line[*]}" & + /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 }