diff --git a/PKGBUILD b/PKGBUILD index c7094f4..783274a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Librewish pkgname=garuda-common-settings -pkgver=2.5.1 +pkgver=2.5.2 pkgrel=1 arch=('any') url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" diff --git a/usr/bin/garuda-inxi b/usr/bin/garuda-inxi index 6583da6..dc99182 100755 --- a/usr/bin/garuda-inxi +++ b/usr/bin/garuda-inxi @@ -4,7 +4,7 @@ detect_dual_boot() { if [[ $EUID -eq 0 ]] && [[ -x /usr/bin/os-prober ]]; then local OSPROBER_OUT="$(os-prober)" || { DUALBOOT="Os-prober error"; exit; } echo $OSPROBER_OUT | grep -q "Windows Boot Manager" &> /dev/null && DUALBOOT="Yes" || DUALBOOT="No/Undetected" - elif [[ -x /usr/bin/efibootmgr ]]; then + elif [[ -x /usr/bin/efibootmgr ]] && [ -d /boot/efi ]; then local EFIBOOTMGR_OUT="$(efibootmgr)" || { DUALBOOT="Efibootmgr error"; exit; } echo $EFIBOOTMGR_OUT | grep -q "Windows Boot Manager" &> /dev/null && DUALBOOT="Probably (Run as root to verify)" || DUALBOOT="No/Undetected" elif [[ -x /usr/bin/os-prober ]]; then @@ -14,11 +14,27 @@ detect_dual_boot() { fi } +detect_snapshots() { + if [ -d /.snapshots ] || pacman -Qq snapper-support &> /dev/null; then + SNAPSHOTS="Snapper" + elif [ -d /run/timeshift ] || pacman -Qq timeshift-support &> /dev/null; then + SNAPSHOTS="Timeshift" + elif pacman -Qq snapper &> /dev/null; then + SNAPSHOTS="Snapper (maybe)" + elif pacman -Qq timeshift &> /dev/null; then + SNAPSHOTS="Timeshift (maybe)" + else + SNAPSHOTS="None/Undetected" + fi +} + [ -t 0 ] && inxi -Faz || inxi -Fazc0 echo -e "\033[1;34mGaruda:\033[0m" echo -e "\033[1;34m System install date:\033[0m $(head -n1 /var/log/pacman.log | cut -d " " -f1 | cut -c 2-11)" echo -e "\033[1;34m Last full system update:\033[0m $(date -r /var/lib/garuda/last_update +%F 2> /dev/null || echo "Unknown/Never")" echo -e "\033[1;34m Is partially upgraded: \033[0m $([ -e /var/lib/garuda/partial_upgrade ] && echo Yes || echo No)" -detect_dual_boot #&> /dev/null echo -e "\033[1;34m Using TLP: \033[0m $(systemctl is-enabled tlp &> /dev/null && echo Yes || echo No)" +detect_dual_boot &> /dev/null echo -e "\033[1;34m Windows dual boot: \033[0m ${DUALBOOT}" +detect_snapshots +echo -e "\033[1;34m Snapshots: \033[0m ${SNAPSHOTS}"