From e9ad9676f0875672d9656828d01a2c206301c4c2 Mon Sep 17 00:00:00 2001 From: castro-fidel Date: Sat, 25 Feb 2023 20:06:56 +0300 Subject: [PATCH] Scripts version 2167 --- data_from_portwine/changelog_eng | 3 + data_from_portwine/changelog_rus | 3 + data_from_portwine/img/gui/roblox.png | Bin 0 -> 3299 bytes data_from_portwine/scripts/functions_helper | 11 ++++ .../scripts/portwine_db/EALauncher | 36 +--------- .../scripts/portwine_db/RobloxPlayer | 39 +++++++++++ .../scripts/pw_autoinstall/PW_EAAPP | 34 ++-------- .../scripts/pw_autoinstall/PW_ROBLOX | 23 +++++++ data_from_portwine/scripts/runlib | 2 +- data_from_portwine/scripts/start.sh | 26 ++++---- data_from_portwine/scripts/var | 2 +- data_from_portwine/scripts/zen_yad_gui | 62 +++++++++++------- 12 files changed, 140 insertions(+), 101 deletions(-) create mode 100755 data_from_portwine/img/gui/roblox.png create mode 100644 data_from_portwine/scripts/portwine_db/RobloxPlayer create mode 100755 data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index b88ee69..aff241f 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,6 +2,9 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: +###Scripts version 2167### +* added installation of the ROBLOX + ###Scripts version 2166### * added a shortcut creation assistant after installing the game/program using setup.exe * the "INSTALLED" tab has been added to the main interface of PortProton, in which you can search for all exe files in all PortProton prefixes diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index c8386ec..3a7658c 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2167### +* добавлена установка ROBLOX + ###Scripts version 2166### * добавлен помощник создания ярлыка после установки игры/программы с помощью setup.exe * в основном интерфейсе PortProton добавлена вкладка "УСТАНОВЛЕННЫЕ" в которой можно произвести поиск всех exe файлов во всех префиксах PortProton diff --git a/data_from_portwine/img/gui/roblox.png b/data_from_portwine/img/gui/roblox.png new file mode 100755 index 0000000000000000000000000000000000000000..da423397834b2b76bc52462b6a4044d120ae768e GIT binary patch literal 3299 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 literal 0 HcmV?d00001 diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 50451c4..117cd37 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -292,6 +292,17 @@ check_user_conf () { } init_wine_ver () { + if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then + orig_IFS="$IFS" + IFS=$'\n' + 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` + 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^^}" + fi + done + IFS="$orig_IFS" + fi if [[ -z `ls "${PORT_WINE_PATH}/data/dist/" | grep "${PW_WINE_USE}"` ]] ; then if [[ ! -z `echo "${PW_WINE_USE}" | grep "PROTON_LG"` ]] ; then export PW_WINE_USE=PROTON_LG diff --git a/data_from_portwine/scripts/portwine_db/EALauncher b/data_from_portwine/scripts/portwine_db/EALauncher index 45e89b4..2315f32 100755 --- a/data_from_portwine/scripts/portwine_db/EALauncher +++ b/data_from_portwine/scripts/portwine_db/EALauncher @@ -4,40 +4,10 @@ #EADesktop.exe #Rating=5 #####################examples########################### -export PW_DLL_INSTALL="vcrun2019" # Install DDL in port prefix (used winetricks) +export PW_DLL_INSTALL="vcrun2022" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL # export PW_USE_TERMINAL="1" -export PW_WINE_TKG_VER="7.20" -export PW_WINE_USE="WINE-${PW_WINE_TKG_VER}-STAGING-TKG-AMD64" export PW_MUST_HAVE_DLL="" export PW_PREFIX_NAME="EA_APP" -# export WINEDLLOVERRIDES="mscoree,mshtml=" - -check_download_wine_ver_for_ea () { - if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then - if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/${PW_WINE_TKG_VER}/wine-${PW_WINE_TKG_VER}-staging-tkg-amd64.tar.xz" \ - "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then - if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - UNPACK_STATUS=0 - else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" - fi - fi - [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 - fi -} -check_download_wine_ver_for_ea - -if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then - orig_IFS="$IFS" - IFS=$'\n' - 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` - 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^^}" - fi - done - IFS="$orig_IFS" -fi +export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" +gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" diff --git a/data_from_portwine/scripts/portwine_db/RobloxPlayer b/data_from_portwine/scripts/portwine_db/RobloxPlayer new file mode 100644 index 0000000..e3387e8 --- /dev/null +++ b/data_from_portwine/scripts/portwine_db/RobloxPlayer @@ -0,0 +1,39 @@ +#!/usr/bin/env bash +#Author: fidel +#RobloxPlayerBeta.exe +#Rating=1-5 +#####################examples########################### +##export PW_COMMENT_DB="blablabla" +##export PW_WINDOWS_VER=10 # Set windows version 10, 7 or XP +##export PW_DLL_INSTALL="vcrun2017" # Install DDL in port prefix (used winetricks) +##export WINEDLLOVERRIDES="blabla=n,b" +##export LAUNCH_PARAMETERS="+com_skipIntroVideo 1 +com_skipSignInManager 1" # Additional launch options +export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" +export PW_VULKAN_USE="1" +##export PW_USE_DXR10=1 +##export PW_DLSS_ON=1 +##export PW_VULKAN_NO_ASYNC=1 # Disabled ASYNC for VULKAN +##export PW_USE_NVAPI_AND_DLSS=0 +##export PW_OLD_GL_STRING=1 +##export PW_HIDE_NVIDIA_GPU=1 +##export PW_FORCE_USE_VSYNC=0 # Vsync: 0-FORCE_OFF, 1-FORCE_ON, 2-BY_DEFAULT +##export PW_VIRTUAL_DESKTOP=1 +##export VKD3D_CONFIG=force_bindless_texel_buffer,multi_queue +##export ENABLE_VKBASALT=1 +##export PW_VKBASALT_EFFECTS="FakeHDR:cas" # Use Reshade in others games (dx9-12 to vulkan only) +##export PW_VKBASALT_FFX_CAS="0.75" # FidelityFX Contrast Adaptive Sharpening (min 0 - max 1) +##export PW_NO_FSYNC=1 # Do not use futex-based in-process synchronization primitives. (Automatically disabled on systems with no FUTEX_WAIT_MULTIPLE support. +##export PW_NO_ESYNC=0 # Do not use eventfd-based in-process synchronization primitives +##export PW_USE_GSTREAMER=1 # 0 - disabled use winegstreamer +##export PULSE_LATENCY_MSEC=60 # Fix crackling audio in games +##export PW_NO_WRITE_WATCH=1 # Disable support for memory write watches in ntdll. This is a very dangerous hack and should only be applied if you have verified that the game can operate without write watches. This improves performance for some very specific games (e.g. CoreRT-based games). +##export PW_HEAP_DELAY_FREE=1 +##export PW_WINE_ALLOW_XIM=1 # Disable XIM support until libx11 >= 1.7 is widespread +##export WINEARCH=win32 # defaut = win64 +##export WINEPREFIX= +##export PW_WINEDBG_DISABLE=1 # Disabled WINEDBG +##export PW_USE_TERMINAL=1 # Force run in terminal +##export PW_GUI_DISABLED_CS=1 # 1 = disabled GUI +##export PATH_TO_GAME= +##add_in_start_portwine () { commands ; } +export PW_PREFIX_NAME="ROBLOX" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP index 475a124..2d93ccf 100755 --- a/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP +++ b/data_from_portwine/scripts/pw_autoinstall/PW_EAAPP @@ -5,44 +5,18 @@ export LAUNCH_PARAMETERS=("/silent" "/repair" ) export PW_AUTOINSTALL_EXE="${PW_USER_TEMP}/EAappInstaller.exe" export PW_DLL_INSTALL="" # Install DDL in port prefix (used winetricks) export PW_VULKAN_USE=1 # dxvk, vkd3d or 0 for OpenGL -# export PW_USE_TERMINAL="1" -# export PW_WINE_TKG_VER="7.20" -# export PW_WINE_USE="WINE-${PW_WINE_TKG_VER}-STAGING-TKG-AMD64" export PW_MUST_HAVE_DLL="" -# export PW_PREFIX_NAME="EA_APP" +export PW_PREFIX_NAME="EA_APP" # export WINEDLLOVERRIDES="mscoree,mshtml=b" +export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" +gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" -# if [ ! -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ] ; then -# if try_download "https://github.com/Kron4ek/Wine-Builds/releases/download/${PW_WINE_TKG_VER}/wine-${PW_WINE_TKG_VER}-staging-tkg-amd64.tar.xz" \ -# "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" ; then -# if unpack_tar_xz "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" "${PORT_WINE_PATH}/data/dist/" ; then -# try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" -# UNPACK_STATUS=0 -# else -# try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_USE}.tar.xz" -# try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" -# fi -# fi -# [[ "${UNPACK_STATUS}" != 0 ]] && exit 1 -# fi - -# if [[ -d "${PORT_WINE_PATH}/data/dist" ]] ; then -# orig_IFS="$IFS" -# IFS=$'\n' -# 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` -# 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^^}" -# fi -# done -# IFS="$orig_IFS" -# fi start_portwine if try_download "origin-a.akamaihd.net/EA-Desktop-Client-Download/installer-releases/EAappInstaller.exe" "${PW_AUTOINSTALL_EXE}" then pw_start_progress_bar_block "${loc_gui_installing_the} EA Launcher. ${loc_gui_please_wait} " - # pw_kill_autostart EABackgroundService.exe & + pw_kill_autostart EABackgroundService.exe & # pw_kill_autostart EALocalHostSvc.exe & mkdir -p "$WINEPREFIX/drive_c/Program Files/Electronic Arts/EA Desktop/EA Desktop" pw_run "${PW_AUTOINSTALL_EXE}" diff --git a/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX new file mode 100755 index 0000000..5624092 --- /dev/null +++ b/data_from_portwine/scripts/pw_autoinstall/PW_ROBLOX @@ -0,0 +1,23 @@ +#!/usr/bin/env bash +# Author: chal55rus (Sergey P.) +######################################################################## +export LAUNCH_PARAMETERS=("") +export PW_PREFIX_NAME="ROBLOX" +export PW_AUTOINSTALL_EXE="${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/drive_c/roblox_installer.exe" +export WINEDLLOVERRIDES="mscoree,mshtml=" +export PW_MUST_HAVE_DLL="" +export PW_WINE_USE="WINE-8.2-STAGING-TKG-AMD64" + +gui_proton_downloader silent "WINE-8.2-STAGING-TKG-AMD64" + +start_portwine +if try_download "setup.rbxcdn.com/RobloxPlayerLauncher.exe" "${PW_AUTOINSTALL_EXE}" +then + pw_run "${PW_AUTOINSTALL_EXE}" + portwine_exe="${WINEPREFIX}/drive_c/users/${USER}/AppData/Local/Roblox/Versions/version-5e9aac577efb4995/RobloxPlayerBeta.exe" + try_remove_file "${portwine_exe}.ppdb" + pw_stop_progress_bar + # export PORTWINE_CREATE_SHORTCUT_NAME="RobloxPlayerBeta" + portwine_create_shortcut +fi +stop_portwine diff --git a/data_from_portwine/scripts/runlib b/data_from_portwine/scripts/runlib index c1b421a..cec987a 100755 --- a/data_from_portwine/scripts/runlib +++ b/data_from_portwine/scripts/runlib @@ -333,7 +333,7 @@ start_portwine () { if [[ -z "`grep d3dx9 "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log"`" ]] ; then echo "d3dx9" >> "${PORT_WINE_PATH}/data/prefixes/${PW_PREFIX_NAME}/winetricks.log" fi - var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;lsteamclient,winemenubuilder.exe=d" + var_winedlloverride_update "steam_api,steam_api64,steamclient,steamclient64=n;dotnetfx35.exe,dotnetfx35setup.exe=b;lsteamclient,winemenubuilder=d" # export TOTAL_VRAM=`"${PW_WINELIB}/runtime/files/bin/glxinfo" -B | grep Total | awk -F: '{print $2}' | awk '{print $1}'` # echo "TOTAL_VRAM=${TOTAL_VRAM}" diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 06318e2..153be0d 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -672,15 +672,18 @@ else orig_IFS="$IFS" && IFS=$'\n' PW_ALL_DF="$(ls ${PORT_WINE_PATH}/ | grep .desktop | grep -vE '(PortProton|readme)')" - IFS="$orig_IFS" + PW_GENERATE_BUTTONS="--field= $loc_create_shortcut_from_gui!$PW_GUI_ICON_PATH/separator.png!:FBTN%@bash -c \"button_click pw_find_exe\"%" - for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do - PW_NAME_D_NAME="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Name | awk -F= '{print $2}')" - # PW_NAME_D_ICON="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Icon | awk -F= '{print $2}')" - PW_NAME_D_ICON="$PW_GUI_ICON_PATH/separator.png" - # PW_GENERATE_BUTTONS+="--field= ${PW_NAME_D_NAME}!${PW_NAME_D_ICON}!:FBTN%@bash -c \"run_desktop_b_click ${PW_DESKTOP_FILES}\"%" - done - + # for PW_DESKTOP_FILES in ${PW_ALL_DF} ; do + # echo $PW_DESKTOP_FILES + # PW_NAME_D_NAME="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Name | awk -F= '{print $2}')" + # PW_NAME_D_ICON="$(cat "${PORT_WINE_PATH}/$PW_DESKTOP_FILES" | grep Icon | awk -F= '{print $2}')" + # #PW_NAME_D_ICON="$PW_GUI_ICON_PATH/separator.png" + # PW_DESKTOP_FILES=$(sed 's/ /¬/g' <<< "$PW_DESKTOP_FILES") + # PW_GENERATE_BUTTONS+="--field= ${PW_NAME_D_NAME}!${PW_NAME_D_ICON}!:FBTN%@bash -c \"run_desktop_b_click "${PW_DESKTOP_FILES}"\"%" + # echo $PW_DESKTOP_FILES + # done + IFS="$orig_IFS" old_IFS=$IFS && IFS="%" "${pw_yad_new}" --plug=$KEY --tabnum=5 --form --columns=2 --align-buttons --keep-icon-size --scroll --separator=" " ${PW_GENERATE_BUTTONS} & IFS="$orig_IFS" @@ -725,16 +728,16 @@ else --field=" Yabause"!"$PW_GUI_ICON_PATH/yabause.png"!"":"FBTN" '@bash -c "button_click PW_YABAUSE"' & "${pw_yad_new}" --plug=$KEY --tabnum=1 --form --columns=3 --align-buttons --keep-icon-size --scroll \ + --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" Wargaming Game Center"!"$PW_GUI_ICON_PATH/wgc.png"!"":"FBTN" '@bash -c "button_click PW_WGC"' \ + --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Battle.net Launcher"!"$PW_GUI_ICON_PATH/battle_net.png"!"":"FBTN" '@bash -c "button_click PW_BATTLE_NET"' \ --field=" Epic Games Launcher"!"$PW_GUI_ICON_PATH/epicgames.png"!"":"FBTN" '@bash -c "button_click PW_EPIC"' \ --field=" GoG Galaxy Launcher"!"$PW_GUI_ICON_PATH/gog.png"!"":"FBTN" '@bash -c "button_click PW_GOG"' \ --field=" Ubisoft Game Launcher"!"$PW_GUI_ICON_PATH/ubc.png"!"":"FBTN" '@bash -c "button_click PW_UBC"' \ --field=" EVE Online Launcher"!"$PW_GUI_ICON_PATH/eve.png"!"":"FBTN" '@bash -c "button_click PW_EVE"' \ - --field=" Lesta Game Center"!"$PW_GUI_ICON_PATH/lgc.png"!"":"FBTN" '@bash -c "button_click PW_LGC"' \ --field=" EA App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' \ --field=" Rockstar Games Launcher"!"$PW_GUI_ICON_PATH/Rockstar.png"!"":"FBTN" '@bash -c "button_click PW_ROCKSTAR"' \ - --field=" vkPlay Games Center"!"$PW_GUI_ICON_PATH/mygames.png"!"":"FBTN" '@bash -c "button_click PW_VKPLAY"' \ --field=" Ankama Launcher"!"$PW_GUI_ICON_PATH/ankama.png"!"":"FBTN" '@bash -c "button_click PW_ANKAMA"' \ --field=" OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \ --field=" League of Legends"!"$PW_GUI_ICON_PATH/lol.png"!"":"FBTN" '@bash -c "button_click PW_LOL"' \ @@ -750,6 +753,7 @@ else --field=" Warframe"!"$PW_GUI_ICON_PATH/warframe.png"!"":"FBTN" '@bash -c "button_click PW_WARFRAME"' \ --field=" Panzar"!"$PW_GUI_ICON_PATH/panzar.png"!"":"FBTN" '@bash -c "button_click PW_PANZAR"' \ --field=" STALCRAFT"!"$PW_GUI_ICON_PATH/stalcraft.png"!"":"FBTN" '@bash -c "button_click PW_STALCRAFT"' \ + --field=" ROBLOX"!"$PW_GUI_ICON_PATH/roblox.png"!"":"FBTN" '@bash -c "button_click PW_ROBLOX"' \ --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' & # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' @@ -836,7 +840,7 @@ case "$PW_YAD_SET" in pw_start_cont_xterm) pw_start_cont_xterm ;; pw_find_exe) pw_find_exe ;; PW_*) pw_autoinstall_from_db ;; - # *) run_desktop_b_click + # *.desktop) run_desktop_b_click esac stop_portwine diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index abe312f..e267bc1 100755 --- a/data_from_portwine/scripts/var +++ b/data_from_portwine/scripts/var @@ -1,6 +1,6 @@ #!/usr/bin/env bash #Author: Castro-Fidel (linux-gaming.ru) -#SCRIPTS_NEXT_VERSION=2166 +#SCRIPTS_NEXT_VERSION=2167 ######################################################################## export PW_MANGOHUD=0 export MANGOHUD_CONFIG=cpu_stats,cpu_temp,cpu_mhz,cpu_color=2e97cb,cpu_text=CPU,gpu_stats,gpu_temp,gpu_core_clock,gpu_mem_clock,vulkan_driver,gpu_name,gpu_color=2e9762,gpu_text=GPU,vram,vram_color=ad64c1,ram,ram_color=c26693,io_color=a491d3,frame_timing=1,frametime_color=00ff00,time,arch,wine,wine_color=eb5b5b,engine_color=eb5b5b,background_alpha=0.2,font_size=24,background_color=020202,text_color=ffffff,toggle_hud=Shift_R+F12,resolution,vkbasalt diff --git a/data_from_portwine/scripts/zen_yad_gui b/data_from_portwine/scripts/zen_yad_gui index 9c1593f..614725d 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -230,6 +230,9 @@ pw_gui_for_edit_db () { gui_proton_downloader () { + if [[ "$1" == "silent" ]] && [[ -d "${PORT_WINE_PATH}/data/dist/${PW_WINE_USE}" ]] ; then + return 0 + fi pw_start_progress_bar_block "$loc_gui_check_new_wine" #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)) @@ -286,30 +289,34 @@ gui_proton_downloader () { sed -i "/${INSTALLING_VERSION_IN_DIST}$/Id" "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" done #Installed wine - ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine - #GUI - export KEY_WINE=$RANDOM - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_set" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set" + ls -l ${PORT_WINE_PATH}/data/dist | awk '{print $9}' | sed '/^$/d' > ${PORT_WINE_TMP_PATH}/tmp_installed_wine + if [[ "$1" != "silent" ]] ; then + #GUI + export KEY_WINE=$RANDOM + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_pw_set" + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_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"` & - `"${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"` & - `"${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"` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --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"` & - `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \ - --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"` & - `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --center \ - --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --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"` - YAD_WINE_STATUS="$?" - if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then - /usr/bin/env bash -c ${pw_full_command_line[*]} & - exit 0 + `"${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"` & + `"${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"` & + `"${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"` & + `"${pw_yad}" --plug=$KEY_WINE --tabnum=4 --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"` & + `"${pw_yad}" --plug=$KEY_WINE --tabnum=5 --list --separator="" --listen \ + --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"` & + `"${pw_yad}" --key=$KEY_WINE --notebook --width=500 --height=600 --text-align=center --center \ + --window-icon="$PW_GUI_ICON_PATH/port_proton.png" --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"` + YAD_WINE_STATUS="$?" + if [[ "$YAD_WINE_STATUS" == "1" || "$YAD_WINE_STATUS" == "252" ]] ; then + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 + fi + elif [[ "$1" == "silent" ]] && [[ -n "$2" ]] ; then + YAD_WINE_STATUS="$2" fi if [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_set" | awk '{print $1}'` ] ; then @@ -364,8 +371,13 @@ gui_proton_downloader () { else zenity_error_download && gui_proton_downloader fi - /usr/bin/env bash -c ${pw_full_command_line[*]} & - exit 0 + + if [[ "$1" != "silent" ]] ; then + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 + else + init_wine_ver + fi } export -f gui_proton_downloader