From 538a5781cfcb0fabf3b0188f5fa814680c6b9abb Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Fri, 28 Oct 2022 01:50:01 +0000
Subject: [PATCH] Update dotfiles/.bashrc

---
 dotfiles/.bashrc | 58 ++++++++++++++++++++++++------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/dotfiles/.bashrc b/dotfiles/.bashrc
index 794a1831..62d2fd7e 100644
--- a/dotfiles/.bashrc
+++ b/dotfiles/.bashrc
@@ -87,56 +87,56 @@ if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then
     . /etc/os-release
     if [ -d /Applications ] && [ -d /Library ] && [ -d /System ]; then
   	  # macOS
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'alpine' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'archlinux' ]; then
-    	OS_ICON=
+    	OS_ICON=""
     elif [ "$ID" = 'centos' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'coreos' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'debian' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'deepin' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'elementary' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'endeavour' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'freebsd' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'gentoo' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'kali' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'linuxmint' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'manjaro' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'nixos' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'openbsd' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'opensuse' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'parrot' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'pop_os' ]; then
-    	OS_ICON=
+    	OS_ICON=""
     elif [ "$ID" = 'raspberry_pi' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'redhat' ]; then
-  	  OS_ICON=
+  	  OS_ICON=""
     elif [ "$ID" = 'fedora' ]; then
-      OS_ICON=
+      OS_ICON=""
     elif [ "$ID" = 'ubuntu' ]; then
-      OS_ICON=
+      OS_ICON=""
     else
-      OS_ICON=
+      OS_ICON=""
     fi
   else
-    OS_ICON=
+    OS_ICON=""
   fi
 
   # Set styled terminal prompt
@@ -265,17 +265,17 @@ if [ "$0" = 'bash' ] || [ "$0" = '/bin/bash' ]; then
   command -v zoxide > /dev/null && eval "$(zoxide init bash)"
 
   ### MOTD
-  if ([ -n "$SSH_CONNECTION" ] && [ "$SHLVL" -eq 1 ] && [[ $- == *i* ]]) || [ -e qubes-vmexec ] || [ -e qubes-dom0-update ]; then
+  if ([ -n "$SSH_CONNECTION" ] && [ "$SHLVL" -eq 1 ] && [[ $- == *i* ]]) || type qubes-vmexec &> /dev/null || type qubes-dom0-update &> /dev/null; then
     if [ -z "$MOTD" ] || [ "$MOTD" -ne 0 ]; then
         . "$HOME/.local/motd.sh"
 
         # TODO - -- services
         if [ -n "$SSH_CONNECTION" ]; then
           bash_motd --banner --processor --memory --diskspace --services --docker --updates --letsencrypt --login
-        elif [ -e qubes-vmexec ]; then
+        elif type qubes-vmexec &> /dev/null; then
           bash_motd --banner --memory --diskspace --docker --updates
-        elif [ -e qubes-dom0-update ]; then
-          bash_motd --processor --updates
+        elif type qubes-dom0-update &> /dev/null; then
+          bash_motd --processor --updates --login
         fi
     fi
   fi