Htylol/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

Merge branch 'Htylol-update-pw_update' into devel

Browse Source
This commit is contained in:
Mikhail Tergoev
2024-10-02 18:00:20 +03:00
parent 7aa7984700 fcff4927c8
commit 9b8c03aa4d
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
data_from_portwine/scripts/functions_helper
View File

@@ -1880,7 +1880,8 @@ pw_port_update () {
[[ "$LANGUAGE" == ru ]] && local PW_CHANGELOG_FILE="changelog_ru" || local PW_CHANGELOG_FILE="changelog_en" [[ "$LANGUAGE" == ru ]] && local PW_CHANGELOG_FILE="changelog_ru" || local PW_CHANGELOG_FILE="changelog_en"
print_info "Scripts version in git = ${scripts_current_ver}" print_info "Scripts version in git = ${scripts_current_ver}"
print_info "Scripts version local = ${scripts_install_ver}\n" print_info "Scripts version local = ${scripts_install_ver}\n"
if [[ -n "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then if [[ -n "${scripts_current_ver}" ]] && [[ "${scripts_current_ver}" -gt "${scripts_install_ver}" ]] ; then
echo "2" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier"
if [[ -f "${PW_GUI_THEMES_PATH}/gui/yad_gui_pp" ]] if [[ -f "${PW_GUI_THEMES_PATH}/gui/yad_gui_pp" ]]
then export pw_yad="${PW_GUI_THEMES_PATH}/gui/yad_gui_pp" then export pw_yad="${PW_GUI_THEMES_PATH}/gui/yad_gui_pp"
elif command -v yad &>/dev/null elif command -v yad &>/dev/null
@@ -1889,7 +1890,7 @@ pw_port_update () {
fi fi
if [[ "${pw_yad}" == "not_found" ]] \ if [[ "${pw_yad}" == "not_found" ]] \
|| [[ "$PW_CHANGE_BRANCH" == "1" ]] ; then || [[ "$PW_CHANGE_BRANCH" == "1" ]] ; then
xcsd="${translations[UPDATING NOW]}" YAD_STATUS=20
unset PW_CHANGE_BRANCH unset PW_CHANGE_BRANCH
else else
curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" > "${PORT_WINE_TMP_PATH}/curent_var_ver" curl -s --list-only "${URL_FOR_CHANGELOG}/${PW_CHANGELOG_FILE}" > "${PORT_WINE_TMP_PATH}/curent_var_ver"
@@ -1903,18 +1904,16 @@ pw_port_update () {
YAD_STATUS="$?" YAD_STATUS="$?"
# --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \ # --button="${translations[EXIT]}"!"$PW_GUI_ICON_PATH/$BUTTON_SIZE.png"!"":252 \
try_remove_file "${PORT_WINE_TMP_PATH}/curent_var_ver"
case ${YAD_STATUS} in
1|252) echo "2" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" && exit 0 ;;
16) xcsd="${translations[DO NOT REMIND ME]}" ;;
18) xcsd="${translations[REMIND ME LATER]}" ;;
20) xcsd="${translations[UPDATING NOW]}" ;;
esac
fi fi
case $xcsd in try_remove_file "${PORT_WINE_TMP_PATH}/curent_var_ver"
"${translations[UPDATING NOW]}") case $YAD_STATUS in
1|252)
exit 0 ;;
16)
echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ;;
18)
: ;;
20)
echo "######################################################" echo "######################################################"
print_info "Update scripts..." print_info "Update scripts..."
try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz" try_remove_file "${PORT_WINE_TMP_PATH}/PortWINE-${BRANCH}.tar.gz"
@@ -1937,10 +1936,6 @@ pw_port_update () {
else else
yad_error_download && pw_port_update || exit 1 yad_error_download && pw_port_update || exit 1
fi ;; fi ;;
"${translations[REMIND ME LATER]}")
echo "2" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ;;
"${translations[DO NOT REMIND ME]}")
echo "0" > "${PORT_WINE_TMP_PATH}/scripts_update_notifier" ;;
esac esac
fi fi
fi fi