Mabox/mabox-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

paru

Browse Source
This commit is contained in:
Daniel Napora
2026-04-05 14:07:53 +02:00
parent be98ac4ef7
commit d0019134b1
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/mb-cli
View File

@@ -44,12 +44,20 @@ esac
case "$1" in case "$1" in
update) update)
if hash paru 2>/dev/null;then
CMD="paru -Syu"
elif hash yay 2>/dev/null;then
CMD="yay -Syu" CMD="yay -Syu"
fi
terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\"" terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\""
tint2-send refresh-execp mb-status tint2-send refresh-execp mb-status
;; ;;
update-noaur) update-noaur)
CMD="yay -N -Syu" if hash paru 2>/dev/null;then
CMD="paru --repo -Syu"
elif hash yay 2>/dev/null;then
CMD="yay --repo -Syu"
fi
terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\"" terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\""
tint2-send refresh-execp mb-status tint2-send refresh-execp mb-status
;; ;;

17
bin/mb-status
View File

@@ -79,6 +79,7 @@ _CHECK_NOW="Sprawdź aktualizacje teraz!"
_PENDING="Dostępne aktualizacje" _PENDING="Dostępne aktualizacje"
_GO_TO_FORUM="Idź na forum" _GO_TO_FORUM="Idź na forum"
_UPDATE_YAY="Aktualizuj za pomocą <b>yay</b>" _UPDATE_YAY="Aktualizuj za pomocą <b>yay</b>"
_UPDATE_PARU="Aktualizuj za pomocą <b>paru</b>"
_NO_AUR="(bez AUR)" _NO_AUR="(bez AUR)"
_UPDATE_PACMAN="Aktualizuj za pomocą <b>pacman</b>" _UPDATE_PACMAN="Aktualizuj za pomocą <b>pacman</b>"
_UPDATE_PAMAC="Aktualizuj <b>Pamac</b> (gui)" _UPDATE_PAMAC="Aktualizuj <b>Pamac</b> (gui)"
@@ -129,6 +130,7 @@ _CHECK_NOW="Check for updates now"
_PENDING="Pending updates" _PENDING="Pending updates"
_GO_TO_FORUM="Update announcement" _GO_TO_FORUM="Update announcement"
_UPDATE_YAY="Update with <b>yay</b>" _UPDATE_YAY="Update with <b>yay</b>"
_UPDATE_PARU="Update with <b>paru</b>"
_NO_AUR="(no AUR)" _NO_AUR="(no AUR)"
_UPDATE_PACMAN="Update with <b>pacman</b>" _UPDATE_PACMAN="Update with <b>pacman</b>"
_UPDATE_PAMAC="Update with <b>Pamac</b> (gui)" _UPDATE_PAMAC="Update with <b>Pamac</b> (gui)"
@@ -251,7 +253,10 @@ out+=("$_GO_TO_FORUM: <b>Mabox</b> forum, xdg-open https://forum.maboxlinux.org/
fi fi
fi fi
if hash yay 2>/dev/null;then if hash paru 2>/dev/null;then
out+=("$_UPDATE_PARU $_NO_AUR,mb-cli update-noaur")
out+=("$_UPDATE_PARU,mb-cli update")
elif hash yay 2>/dev/null;then
out+=("$_UPDATE_YAY $_NO_AUR,mb-cli update-noaur") out+=("$_UPDATE_YAY $_NO_AUR,mb-cli update-noaur")
out+=("$_UPDATE_YAY,mb-cli update") out+=("$_UPDATE_YAY,mb-cli update")
fi fi
@@ -283,6 +288,11 @@ fi
if [[ "${disk_limit}" -gt "0" ]];then if [[ "${disk_limit}" -gt "0" ]];then
out+=("^sep($_DISCS)") out+=("^sep($_DISCS)")
if hash btrfs-assistant-launcher 2>/dev/null;then
out+=("<b>Btrfs</b> Assistant,btrfs-assistant-launcher")
out+=("^sep()")
fi
mpoint=""
while read DEVICE SIZE USED FREE PERCENT MOUNT while read DEVICE SIZE USED FREE PERCENT MOUNT
do do
[[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT} [[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
@@ -290,7 +300,12 @@ if [[ "${disk_limit}" -gt "0" ]];then
[[ "${MOUNT}" = *"media"* ]] && ICON="<big>󱊟</big>" || ICON="<big>󰋊</big>" [[ "${MOUNT}" = *"media"* ]] && ICON="<big>󱊟</big>" || ICON="<big>󰋊</big>"
[[ "${PERCENT::-1}" -ge "${disk_limit}" ]] && PERCENT="<span bgcolor='${WARN_BGCOLOR}' fgcolor='${WARN_FGCOLOR}'> ${PERCENT} </span>" || PERCENT="<span> ${PERCENT} </span>" [[ "${PERCENT::-1}" -ge "${disk_limit}" ]] && PERCENT="<span bgcolor='${WARN_BGCOLOR}' fgcolor='${WARN_FGCOLOR}'> ${PERCENT} </span>" || PERCENT="<span> ${PERCENT} </span>"
if [[ "$DEVICE" == "$mpoint" ]];then
continue
else
out+=("$ICON $MOUNTLBL <small>$DEVICE</small> $PERCENT,^pipe(jgbrowser ${MOUNT}${qdir})") out+=("$ICON $MOUNTLBL <small>$DEVICE</small> $PERCENT,^pipe(jgbrowser ${MOUNT}${qdir})")
mpoint="${DEVICE}"
fi
done < <(df -h | grep '^/dev' | grep -v 'boot' | grep -v 'loop' | grep -v '/run/media') done < <(df -h | grep '^/dev' | grep -v 'boot' | grep -v 'loop' | grep -v '/run/media')
fi fi