diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index aff241fa..4815d2d1 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 2168### +* HOTFIX for ROBLOX + ###Scripts version 2167### * added installation of the ROBLOX diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 3a7658c4..ac608d14 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,9 @@ ----------------------------------------- История изменений: +###Scripts version 2168### +* HOTFIX установки ROBLOX + ###Scripts version 2167### * добавлена установка ROBLOX diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index e267bc1b..0f48be7c 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=2167 +#SCRIPTS_NEXT_VERSION=2168 ######################################################################## 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 614725d2..cf944151 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -315,29 +315,30 @@ gui_proton_downloader () { /usr/bin/env bash -c ${pw_full_command_line[*]} & exit 0 fi + + if [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_set" | awk '{print $1}'` ] ; then + 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 + export VERSION_INSTALLED_WINE="`cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"`" + fi + + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" + 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_proton_set" + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" + try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine" + elif [[ "$1" == "silent" ]] && [[ -n "$2" ]] ; then - YAD_WINE_STATUS="$2" + VERSION_WINE_GIT="$2" fi - if [ ! -z `cat "${PORT_WINE_TMP_PATH}/tmp_proton_set" | awk '{print $1}'` ] ; then - 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 - export VERSION_INSTALLED_WINE="`cat "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"`" - fi - - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_proton_ge_git" - 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_proton_set" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set" - try_remove_file "${PORT_WINE_TMP_PATH}/tmp_installed_wine" - for GIVE_WINE_URL in ${PROTON_GE_GIT[@]} ${PROTON_PW_GIT[@]} ${WINE_KRON4EK[@]} ${WINE_GE_CUSTOM[@]} ; do if [ ! -z `echo ${GIVE_WINE_URL} | grep -i "$VERSION_WINE_GIT"` ] ; then export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}"