From 869f091dc3b5371924bf78430372b61ac921b3ce Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Thu, 19 Mar 2026 16:34:03 +0100 Subject: [PATCH] mb-status mirror rank upd --- bin/about-mabox | 2 +- bin/mb-status | 37 +++++++++++++++++++++++-------------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/bin/about-mabox b/bin/about-mabox index ed302b0..72dae71 100755 --- a/bin/about-mabox +++ b/bin/about-mabox @@ -17,7 +17,7 @@ yad --title="About Mabox" --window-icon=mbcc \ --pversion="$(lsb_release -rs) ${OSCODE}" \ --image=mbcc \ --comments="${COMMENT}" \ - --copyright="Copyright 2016-2025, Daniel Napora " \ + --copyright="Copyright 2016-2026, Daniel Napora " \ --license=GPL3 \ --website="https://maboxlinux.org" \ --website-label=maboxlinux.org \ diff --git a/bin/mb-status b/bin/mb-status index ab52080..2fc849d 100755 --- a/bin/mb-status +++ b/bin/mb-status @@ -190,7 +190,7 @@ if hash expac 2>/dev/null && [[ "${big_pkgs}" -gt 0 ]];then out2+=("$(printf '%2s.' $count) $pkgname $size M,mb-cli pkginfo $pkgname") done< <(expac -H M '%-20n %10m' | sort -rhk 2 | head -n "${big_pkgs}") out2+=("^sep($_PKGS_STATS)") - out2+=(" yay -Ps,mb-cli stats") + out2+=(" yay -Ps,mb-cli stats") if hash qdirstat 2>/dev/null;then out2+=("󰀻 $_QDIRPKG,qdirstat pkg:/") fi @@ -217,29 +217,38 @@ out+=("󰦛 $_CHECK_NOW,checkupdates.sh -p") out+=("^sep()") out+=("$_RANK_MIRROR,^checkout(mirrors)") out+=("^sep()") -out+=("$_RENEW_KEYS,^term(sudo pacman -Sy archlinux-keyring manjaro-keyring mabox-keyring;read -p "${FINISHED}"") -out2+=("^tag(mirrors)") -out2+=("^sep($_MIRROR_RANKING)") -out2+=("Fasttrack pacman-mirrors -f5,mb-cli mirrors") -out2+=("All pacman-mirrors -i -c all,mb-cli mirrors_all") -out2+=("Geoip pacman-mirrors -i --geoip,mb-cli mirrors_geo") + if hash pacman-mirrors 2>/dev/null;then + out+=("$_RENEW_KEYS,^term(sudo pacman -Sy archlinux-keyring manjaro-keyring mabox-keyring;read -p "${FINISHED}"") + out2+=("^tag(mirrors)") + out2+=("^sep($_MIRROR_RANKING)") + out2+=("Fasttrack pacman-mirrors -f5,mb-cli mirrors") + out2+=("All pacman-mirrors -i -c all,mb-cli mirrors_all") + fi fi if [[ "${updates}" != 0 ]];then out+=("^sep( 󰮯 $_PENDING: ${updates} )") out+=("^sep( repo: ${REPO} AUR: ${AUR} )") -[[ "${updates}" -gt 10 ]] && out+=("$_GO_TO_FORUM: Mabox forum, xdg-open https://forum.maboxlinux.org/c/news-development/updates/25" "$_GO_TO_FORUM: Manjaro forum,xdg-open https://forum.manjaro.org/c/announcements/stable-updates/" "^sep()") + +if hash pacman-mirrors 2>/dev/null;then +if [[ "${updates}" -gt 10 ]];then +out+=("$_GO_TO_FORUM: Mabox forum, xdg-open https://forum.maboxlinux.org/c/news-development/updates/25" "$_GO_TO_FORUM: Manjaro forum,xdg-open https://forum.manjaro.org/c/announcements/stable-updates/" "^sep()") +fi +fi + +if hash yay 2>/dev/null;then out+=("$_UPDATE_YAY $_NO_AUR,mb-cli update-noaur") out+=("$_UPDATE_YAY,mb-cli update") +fi out+=("$_UPDATE_PACMAN,mb-cli pacupdate") out+=("^sep()") out+=("$_RENEW_KEYS,^term(sudo pacman -Sy archlinux-keyring manjaro-keyring mabox-keyring;read -p "${FINISHED}"") #out+=("^sep()") #out+=("$_UPDATE_PAMAC,pamac-manager --updates") - -out+=("^sep($_MIRROR_RANKING)") -out+=("Fasttrack pacman-mirrors -f5,mb-cli mirrors") -out+=("All pacman-mirrors -i -c all,mb-cli mirrors_all") -out+=("Geoip pacman-mirrors -i --geoip,mb-cli mirrors_geo") + if hash pacman-mirrors 2>/dev/null;then + out+=("^sep($_MIRROR_RANKING)") + out+=("Fasttrack pacman-mirrors -f5,mb-cli mirrors") + out+=("All pacman-mirrors -i -c all,mb-cli mirrors_all") + fi fi @@ -402,7 +411,7 @@ jgmenu --config-file=${CONFIG_FILE} --csv-file=${MENU_ITEMS} ${option} 2>/dev/nu #--field="important for Mabox's continued existence.":LBL \ #--button="Donate":"$LINK" --button="No Thanks":"0" #} -#updates=100 +#updates=99 status(){ #if [[ "$DIFF" -gt "1" ]];then #DDATE=$(date +%Y-%m-%d)