avoid using sudo if already using account root

Author: adrelanos

usr/bin/upgrade-nonroot

@@ -8,16 +8,25 @@ set -e
 # shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.bsh
 source /usr/libexec/helper-scripts/package_installed_check.bsh
 
+if [ "$(id -un)" = 'root' ]; then
+  ## Avoid using 'sudo' if already using account 'root'. Reasons:
+  ## - Using 'sudo' is unnecessary in this case.
+  ## - Would work in case of a user-sysmaint-split or sudo bug.
+  exec /usr/bin/apt-get-update-plus dist-upgrade
+fi
+
+## This is never reached if using 'exec' above.
+
 if pkg_installed user-sysmaint-split; then
   ## Example use cases for using account 'root' with user-sysmaint-split installed:
   ## - root login
   ## - Qubes root console.
-  if [ "$(id -un)" != 'sysmaint' ] && [ "$(id -un)" != 'root' ]; then
+  if [ "$(id -un)" != 'sysmaint' ]; then
     1>&2 echo "ERROR: upgrade-nonroot cannot be used by accounts other than"
     1>&2 echo "'sysmaint' (or 'root') on this system. For more information, see"
     1>&2 echo "https://www.kicksecure.com/wiki/Sysmaint"
     exit 1
   fi
 fi
 
-sudo /usr/bin/apt-get-update-plus dist-upgrade
+exec sudo /usr/bin/apt-get-update-plus dist-upgrade