diff --git a/bin/mb-cli b/bin/mb-cli
index c77d623..a380138 100755
--- a/bin/mb-cli
+++ b/bin/mb-cli
@@ -44,13 +44,21 @@ esac
case "$1" in
update)
+ if hash paru 2>/dev/null;then
+ CMD="paru -Syu"
+ elif hash yay 2>/dev/null;then
CMD="yay -Syu"
+ fi
terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\""
tint2-send refresh-execp mb-status
;;
update-noaur)
- CMD="yay -N -Syu"
- terminator "${OPT}" -T "$_UPDATE: ($CMD)" -e "${CMD};read -p \"${_FINISHED}\""
+ 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}\""
tint2-send refresh-execp mb-status
;;
pacupdate)
diff --git a/bin/mb-status b/bin/mb-status
index cb68e2e..0023fe3 100755
--- a/bin/mb-status
+++ b/bin/mb-status
@@ -79,6 +79,7 @@ _CHECK_NOW="Sprawdź aktualizacje teraz!"
_PENDING="Dostępne aktualizacje"
_GO_TO_FORUM="Idź na forum"
_UPDATE_YAY="Aktualizuj za pomocą yay"
+_UPDATE_PARU="Aktualizuj za pomocą paru"
_NO_AUR="(bez AUR)"
_UPDATE_PACMAN="Aktualizuj za pomocą pacman"
_UPDATE_PAMAC="Aktualizuj Pamac (gui)"
@@ -129,6 +130,7 @@ _CHECK_NOW="Check for updates now"
_PENDING="Pending updates"
_GO_TO_FORUM="Update announcement"
_UPDATE_YAY="Update with yay"
+_UPDATE_PARU="Update with paru"
_NO_AUR="(no AUR)"
_UPDATE_PACMAN="Update with pacman"
_UPDATE_PAMAC="Update with Pamac (gui)"
@@ -251,7 +253,10 @@ out+=("$_GO_TO_FORUM: Mabox forum, xdg-open https://forum.maboxlinux.org/
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,mb-cli update")
fi
@@ -283,6 +288,11 @@ fi
if [[ "${disk_limit}" -gt "0" ]];then
out+=("^sep($_DISCS)")
+ if hash btrfs-assistant-launcher 2>/dev/null;then
+ out+=("Btrfs Assistant,btrfs-assistant-launcher")
+ out+=("^sep()")
+ fi
+ mpoint=""
while read DEVICE SIZE USED FREE PERCENT MOUNT
do
[[ "${#MOUNT}" -gt "10" ]] && MOUNTLBL=${MOUNT##*/} || MOUNTLBL=${MOUNT}
@@ -290,7 +300,12 @@ if [[ "${disk_limit}" -gt "0" ]];then
[[ "${MOUNT}" = *"media"* ]] && ICON="" || ICON=""
[[ "${PERCENT::-1}" -ge "${disk_limit}" ]] && PERCENT=" ${PERCENT} " || PERCENT=" ${PERCENT} "
- out+=("$ICON $MOUNTLBL $DEVICE $PERCENT,^pipe(jgbrowser ${MOUNT}${qdir})")
+ if [[ "$DEVICE" == "$mpoint" ]];then
+ continue
+ else
+ out+=("$ICON $MOUNTLBL $DEVICE $PERCENT,^pipe(jgbrowser ${MOUNT}${qdir})")
+ mpoint="${DEVICE}"
+ fi
done < <(df -h | grep '^/dev' | grep -v 'boot' | grep -v 'loop' | grep -v '/run/media')
fi