diff --git a/data_from_portwine/changelog_eng b/data_from_portwine/changelog_eng index ade6f8a..32fedd8 100755 --- a/data_from_portwine/changelog_eng +++ b/data_from_portwine/changelog_eng @@ -2,15 +2,19 @@ You can help us in the development of the project on the website: boosty.to/linu ----------------------------------------- Changelog: -###Scripts version 2201### Дата: 12.06.2023 / Update download size: 9 megabytes. +###Scripts version 2202### Date: 15.06.2023 / Update download size: 9 megabytes. +* added Genshin Impact (again) +* fix: download PROTON-GE + +###Scripts version 2201### Date: 12.06.2023 / Update download size: 9 megabytes. * improved readability of the output when running portproton from the terminal * fixed the launch of the game World of Sea Battle * added the selection of the settings file before launching setup.exe -###Scripts version 2200### Дата: 06.06.2023 / Update download size: 9 megabytes. +###Scripts version 2200### Date: 06.06.2023 / Update download size: 9 megabytes. * updated WINE for League of Legends -###Scripts version 2199### Дата: 05.06.2023 / Update download size: 9 megabytes. +###Scripts version 2199### Date: 05.06.2023 / Update download size: 9 megabytes. * minor fixes * function removed: check_nvidia_vk_icd_file diff --git a/data_from_portwine/changelog_rus b/data_from_portwine/changelog_rus index 420b81d..b720376 100755 --- a/data_from_portwine/changelog_rus +++ b/data_from_portwine/changelog_rus @@ -2,6 +2,10 @@ ----------------------------------------- История изменений: +###Scripts version 2202### Дата: 15.06.2023 / Размер скачиваемого обновления: 9 мегабайт. +* возвращена установка Genshin Impact. (Снова заработал, на долго?) +* исправлена загрузка WINE версий PROTON-GE + ###Scripts version 2201### Дата: 12.06.2023 / Размер скачиваемого обновления: 9 мегабайт. * улучшена читаемость вывода при запуске portproton из терминала * исправлен запуск игры World of Sea Battle diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index d747630..b2f10c4 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -772,10 +772,10 @@ else --field=" OSU"!"$PW_GUI_ICON_PATH/osu.png"!"":"FBTN" '@bash -c "button_click PW_OSU"' \ --field=" ITCH.IO"!"$PW_GUI_ICON_PATH/itch.png"!"":"FBTN" '@bash -c "button_click PW_ITCH"' \ --field=" Steam (unstable)"!"$PW_GUI_ICON_PATH/steam.png"!"":"FBTN" '@bash -c "button_click PW_STEAM"' \ - --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' 2>/dev/null & + --field=" Path of Exile"!"$PW_GUI_ICON_PATH/poe.png"!"":"FBTN" '@bash -c "button_click PW_POE"' \ + --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' 2>/dev/null & # --field=" Electronic Arts App"!"$PW_GUI_ICON_PATH/eaapp.png"!"":"FBTN" '@bash -c "button_click PW_EAAPP"' - # --field=" Genshin Impact"!"$PW_GUI_ICON_PATH/genshinimpact.png"!"":"FBTN" '@bash -c "button_click PW_GENSHIN_IMPACT"' # --field=" Secret World Legends (ENG)"!"$PW_GUI_ICON_PATH/swl.png"!"":"FBTN" '@bash -c "button_click PW_SWL"' # --field=" Guild Wars 2"!"$PW_GUI_ICON_PATH/gw2.png"!"":"FBTN" '@bash -c "button_click PW_GUILD_WARS_2"' # --field=" Bethesda.net Launcher"!"$PW_GUI_ICON_PATH/bethesda.png"!"":"FBTN" '@bash -c "button_click PW_BETHESDA"' diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index 7e80c78..ed9271f 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=2201 +#SCRIPTS_NEXT_VERSION=2202 ######################################################################## 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 ad3bee7..124c38d 100755 --- a/data_from_portwine/scripts/zen_yad_gui +++ b/data_from_portwine/scripts/zen_yad_gui @@ -295,22 +295,24 @@ gui_proton_downloader () { #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_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"` & + --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"` & + --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"` & + --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 \ - --column "$loc_gui_set_new_wine" < "${PORT_WINE_TMP_PATH}/tmp_wine_ge_custom_git" 1> "${PORT_WINE_TMP_PATH}/tmp_ge_custom_set"` & + --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 \ - --column "$loc_gui_del_wine" < "${PORT_WINE_TMP_PATH}/tmp_installed_wine" 1> "${PORT_WINE_TMP_PATH}/tmp_installed_wine_set"` & + --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/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"` + --tab-pos=top --tab="PROTON-LG" --tab="WINE-KRON4EK" --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 /usr/bin/env bash -c ${pw_full_command_line[*]} & @@ -327,13 +329,16 @@ gui_proton_downloader () { 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"`" + else + print_info "Nothing to do." + /usr/bin/env bash -c ${pw_full_command_line[*]} & + exit 0 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_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" elif [[ "$1" == "silent" ]] && [[ -n "$2" ]] ; then @@ -341,8 +346,9 @@ gui_proton_downloader () { 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 + if [ ! -z `echo ${GIVE_WINE_URL} | grep -i "${VERSION_WINE_GIT}"` ] ; then export URL_VERSION_PROTON_GIT="${GIVE_WINE_URL}" + break fi done