diff --git a/data_from_portwine/changelog_en b/data_from_portwine/changelog_en index 81335067..67ac2ea3 100755 --- a/data_from_portwine/changelog_en +++ b/data_from_portwine/changelog_en @@ -2,6 +2,12 @@ You can help us in the development of the project on the website: https://linux- ---------------------------------------- Changelog: +###Scripts version 2347### / Date: 16.09.2024 / Download update size: 4 megabytes +* added PW_NO_AUTO_CREATE_SHORTCUT variable to exclude automatic shortcut creation +* added the ability to reset global user.conf settings (thanks to Htylol) +* improved function for checking script updates (thanks to Htylol) +* added CLI argument: "--update" to force checking for updates + ###Scripts version 2346### / Date: 14.09.2024 / Download update size: 4 megabytes * Fixed bug with long wait for updates diff --git a/data_from_portwine/changelog_ru b/data_from_portwine/changelog_ru index 76febeb5..0f23fd62 100755 --- a/data_from_portwine/changelog_ru +++ b/data_from_portwine/changelog_ru @@ -2,6 +2,12 @@ ----------------------------------------- История изменений: +###Scripts version 2347### / Дата: 16.09.2024 / Размер скачиваемого обновления: 4 мегабайт +* добавлена переменная PW_NO_AUTO_CREATE_SHORTCUT для исключения автоматического создания ярлыка +* добавлена возможность сброса глобальных настроек user.conf (спасибо Htylol) +* улучшена функция проверки обновления скриптов (спасибо Htylol) +* добавлен аргумент CLI: "--update" для принудительной проверки обновлений + ###Scripts version 2346### / Дата: 14.09.2024 / Размер скачиваемого обновления: 4 мегабайт * Исправлена ошибка длительного ожидания обновлений diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index 89ee80a4..60b3d8c2 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -1575,7 +1575,7 @@ pw_port_update () { pw_check_update () { debug_timer --start - if ! timeout 3 curl -f -s --list-only "$URL_ETERFUND" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + if ! timeout 2 curl -f -s --list-only "$URL_ETERFUND" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then print_warning "https://gitlab.eterfund.ru/ broken. Skip it..." UPDATE_SKIP_ETERFUND="1" @@ -1584,7 +1584,7 @@ pw_port_update () { UPDATE_ETERFUND="$DIFF" debug_timer --start - if ! timeout 3 curl -f -s --list-only "$URL_GITHUB" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + if ! timeout 2 curl -f -s --list-only "$URL_GITHUB" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then print_warning "https://raw.githubusercontent.com/ broken. Skip it..." UPDATE_SKIP_GITHUB="1" @@ -1610,11 +1610,11 @@ pw_port_update () { UPDATE_DAYS=$(date +%-j) UPDATE_MINUTES=$(($(date +%-H) * 60 + $(date +%-M))) if [[ "$UPDATE_ETERFUND" == "$UPDATE_MIN" ]] ; then - print_info "Selected https://gitlab.eterfund.ru/" + # print_info "Selected https://gitlab.eterfund.ru/" echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_ETERFUND $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror" UPDATE_URL_MIRROR="UPDATE_ETERFUND" elif [[ "$UPDATE_GITHUB" == "$UPDATE_MIN" ]] ; then - print_info "Selected https://raw.githubusercontent.com/" + # print_info "Selected https://raw.githubusercontent.com/" echo "$UPDATE_DAYS $UPDATE_MINUTES UPDATE_GITHUB $UPDATE_MINUTES" > "${PORT_WINE_TMP_PATH}/update_skip_mirror" UPDATE_URL_MIRROR="UPDATE_GITHUB" fi @@ -1648,7 +1648,7 @@ pw_port_update () { case "$UPDATE_URL_MIRROR" in UPDATE_ETERFUND) if [[ ! -f "${PORT_WINE_TMP_PATH}/curent_var_ver" ]] \ - && ! timeout 3 curl -f -s --list-only "$URL_ETERFUND" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + && ! timeout 2 curl -f -s --list-only "$URL_ETERFUND" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then pw_check_update fi @@ -1657,7 +1657,7 @@ pw_port_update () { ;; UPDATE_GITHUB) if [[ ! -f "${PORT_WINE_TMP_PATH}/curent_var_ver" ]] \ - && ! timeout 3 curl -f -s --list-only "$URL_GITHUB" > "${PORT_WINE_TMP_PATH}/curent_var_ver" + && ! timeout 2 curl -f -s --list-only "$URL_GITHUB" > "${PORT_WINE_TMP_PATH}/curent_var_ver" then pw_check_update fi @@ -5052,7 +5052,8 @@ portwine_create_shortcut () { } pw_auto_create_shortcut () { - if [[ "${PW_CHECK_AUTOINSTALL}" == 1 ]] \ + if [[ "${PW_CHECK_AUTOINSTALL}" == "1" ]] \ + || [[ "${PW_NO_AUTO_CREATE_SHORTCUT}" == "1" ]] \ || [[ -z "${portwine_exe}" ]] \ || echo "${portwine_exe}" | grep -i "gc_api.exe\|vkplay\|pulseonline" &>/dev/null then diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 966fd5bb..d1c0faa2 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -98,7 +98,7 @@ unset CHK_SYMLINK_FILE PW_MESA_GL_VERSION_OVERRIDE PW_VKD3D_FEATURE_LEVEL PATH_T 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 FPS_LIMIT PW_WINE_USE WINEDLLPATH WINE WINEDIR WINELOADER WINESERVER PW_USE_RUNTIME PORTWINE_CREATE_SHORTCUT_NAME MIRROR -unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG +unset PW_LOCALE_SELECT PW_SETTINGS_INDICATION PW_GUI_START PW_AUTOINSTALL_EXE NOSTSTDIR RADV_DEBUG PW_NO_AUTO_CREATE_SHORTCUT export PORT_WINE_TMP_PATH="${PORT_WINE_PATH}/data/tmp" rm -f "$PORT_WINE_TMP_PATH"/*{exe,msi,tar}* @@ -461,6 +461,9 @@ use: [--repair] [--reinstall] [--autoinstall] echo " --debug debug scripts for PortProton (saved log in $PORT_WINE_PATH/scripts-debug.log) +" + echo " +--update check update scripts for PortProton " exit 0 ;; @@ -482,12 +485,16 @@ use: [--repair] [--reinstall] [--autoinstall] export PW_DEBUG="set -x" /usr/bin/env bash -c ${pw_full_command_line[*]} 2>&1 | tee "$PORT_WINE_PATH/scripts-debug.log" & exit 0 ;; + '--server-file-access' ) echo curl -s --list-only "https://cloud.linux-gaming.ru/log/$(date +20%y_%m)_file_access.log" | sort -V -k 2,2 \ | sed 's/count=//g' | awk '{a=$1; $1=$2; $2=a} 1' | awk 'BEGIN {print "Count: Name:"} {print}' | column -t echo exit 0 ;; + + '--update' ) + gui_pw_update ;; esac ### GUI ### diff --git a/data_from_portwine/scripts/var b/data_from_portwine/scripts/var index a168b90f..d0a30b01 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=2346 +#SCRIPTS_NEXT_VERSION=2347 #SCRIPTS_STABLE_VERSION=2342 ######################################################################## # export PROTON_USE_XALIA="1"