diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index 4815d2d1..5af0996d 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,10 +2,10 @@ 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 2169### +* HOTFIX for ROBLOX (updated) -###Scripts version 2167### +###Scripts version 2168### * added installation of the ROBLOX ###Scripts version 2166### diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index ac608d14..eee1a72a 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,10 +2,10 @@ ----------------------------------------- История изменений: -###Scripts version 2168### -* HOTFIX установки ROBLOX +###Scripts version 2169### +* HOTFIX установки ROBLOX (обнолено) -###Scripts version 2167### +###Scripts version 2168### * добавлена установка ROBLOX ###Scripts version 2166### diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 0f48be7c..fac4f68b 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=2168 +#SCRIPTS_NEXT_VERSION=2169 ######################################################################## 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 cf944151..83cdb383 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -338,7 +338,7 @@ gui_proton_downloader () { elif [[ "$1" == "silent" ]] && [[ -n "$2" ]] ; then VERSION_WINE_GIT="$2" fi - + 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}" @@ -353,18 +353,19 @@ gui_proton_downloader () { fi print_info "Download and install ${VERSION_WINE_GIT}..." + PW_WINE_ARCHIVE="$(echo ${URL_VERSION_PROTON_GIT} | awk -F'/' '{print $NF}' | awk -F'.tar' '{print $1}')" if try_download_to_path "${URL_VERSION_PROTON_GIT}" "${PORT_WINE_PATH}/data/tmp/" ; then for archive_type in "gz" "xz" ; do - if [ -f "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" ] ; then - if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then - try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" + if [ -f "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" ] ; then + if unpack_tar_${archive_type} "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" "${PORT_WINE_PATH}/data/dist/" ; then + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" if [ ! -z "${portwine_exe}" ]; then PW_WINE_USE=${VERSION_WINE_GIT} edit_db_from_gui PW_WINE_USE fi else - try_remove_file "${PORT_WINE_PATH}/data/tmp/${VERSION_WINE_GIT}.tar.${archive_type}" - try_remove_dir "${PORT_WINE_PATH}/data/dist/${VERSION_WINE_GIT}" + try_remove_file "${PORT_WINE_PATH}/data/tmp/${PW_WINE_ARCHIVE}.tar.${archive_type}" + try_remove_dir "${PORT_WINE_PATH}/data/dist/${PW_WINE_ARCHIVE}" zenity_error_download && gui_proton_downloader fi fi