upgrayyedd: maint

diff --git a/dot-local/bin/upgrayyedd b/dot-local/bin/upgrayyedd
index f893693b2b839d028b63e29ab319547813abe2d4..7d71bedddcc2e1d065a48dde6d27a187a7dd4593 100755 (executable)
--- a/dot-local/bin/upgrayyedd
+++ b/dot-local/bin/upgrayyedd
@@ -1,8 +1,7 @@
 #!/bin/bash
 
 #make sure we're running gentoo
-test $(grep -e ^ID /etc/os-release | cut -f2 -d\=) = gentoo || exit
-source /etc/portage/make.conf
+grep -i gentoo /etc/os-release || exit
 
 declare precmd
 if [[ $(id -u) -ne 0 ]];
@@ -47,38 +46,38 @@ case "$1" in
         emerge -puDNg @world
         ;;
     sync|ref|refresh)
-        $precmd emaint sync -A
+        "$precmd" emaint sync -A
         ;;
     world|dup)
-        $precmd /usr/bin/emerge -avuDNg @world "${@:2}"
+        "$precmd" /usr/bin/emerge -avuDNg @world "${@:2}"
         exit 0
         ;;
     install|in)
-        $precmd /usr/bin/emerge -avg "${@:2}"
+        "$precmd" /usr/bin/emerge -avg "${@:2}"
         exit 0
         ;;
     skipkernel)
-        $precmd /usr/bin/emerge -avuDNg @world --exclude=dist-kernel --exclude=gentoo-kernel --exclude=gentoo-sources --exclude=git-sources "${@:2}"
+        "$precmd" /usr/bin/emerge -avuDNg @world --exclude=dist-kernel --exclude=gentoo-kernel --exclude=gentoo-sources --exclude=git-sources "${@:2}"
         exit 0
         ;;
     preserved)
-        $precmd /usr/bin/emerge -av @preserved-rebuild
+        "$precmd" /usr/bin/emerge -av @preserved-rebuild
         exit 0
         ;;
     wholeworld)
-        $precmd /usr/bin/emerge -avuDeg --with-bdeps=y --usepkg=n --keep-going=y @world --exclude="acct-group/* acct-user/* virtual/* app-eselect/* sys-kernel/* sys-firmware/* dev-python/* dev-java/* dev-ruby/* dev-perl/* dev-lua/* dev-php/* dev-tex/* dev-texlive/* x11-themes/* */*-bin"
+        "$precmd" /usr/bin/emerge -avuDeg --with-bdeps=y --usepkg=n --keep-going=y @world --exclude="acct-group/* acct-user/* virtual/* app-eselect/* sys-kernel/* sys-firmware/* dev-python/* dev-java/* dev-ruby/* dev-perl/* dev-lua/* dev-php/* dev-tex/* dev-texlive/* x11-themes/* */*-bin"
         exit 0
         ;;
     search|se)
-        $precmd /usr/bin/emerge --search "${@:2}"
+        "$precmd" /usr/bin/emerge --search "${@:2}"
         exit 0
         ;;
     clean|rm)
-        $precmd /usr/bin/emerge -a --depclean "${@:2}"
+        "$precmd" /usr/bin/emerge -a --depclean "${@:2}"
         exit 0
         ;;
     live)
-        $precmd /usr/bin/emerge -av @live-rebuild
+        "$precmd" /usr/bin/emerge -av @live-rebuild
         ;;
     flatpaks)
         flatpak update
@@ -142,7 +141,7 @@ case "$1" in
         echo "Relevant files in /boot:"
                echo ""
         command ls -1 --hide='*/' /boot/System.map* /boot/initramfs* /boot/vmlinuz*
-        $precmd eclean-kernel -aA -L std
+        "$precmd" eclean-kernel -aA -L std
         ;;
     log)
         grep -i --color=auto "completed" /var/log/emerge.log