Merge remote-tracking branch 'ArrayBolt3/arraybolt3/misc-fixes'

Author: adrelanos

etc/privleap/conf.d/usability-misc.conf

@@ -14,4 +14,4 @@ set -e
 
 export POLICYRCD DEBIAN_FRONTEND DEBIAN_PRIORITY DEBCONF_NOWARNINGS APT_LISTCHANGES_FRONTEND NEEDRESTART_MODE
 
-apt-get -o Dpkg::Options::="--force-confask,confnew,confmiss" "$@"
+apt-get --yes -o Dpkg::Options::="--force-confask,confnew,confmiss" "$@"

usr/bin/apt-get-noninteractive

@@ -5,8 +5,8 @@
 
 set -e
 
-[ -n "$apt_get_update_wrapper" ] || apt_get_update_wrapper="apt-get-noninteractive update"
-[ -n "$apt_bin" ] || apt_bin=apt-get-noninteractive
+[ -n "$apt_get_update_wrapper" ] || apt_get_update_wrapper="apt-get update"
+[ -n "$apt_bin" ] || apt_bin=apt-get
 
 $apt_get_wrapper_pre $apt_get_update_wrapper $apt_get_wrapper_post
 

usr/bin/apt-get-update-plus

@@ -29,4 +29,4 @@ set -e
 # export askpass_title
 # export askpass_message
 
-SUDO_ASKPASS=/usr/libexec/usablity-misc/sudo-askpass-gui sudoedit --askpass -- "$@"
+SUDO_ASKPASS=/usr/libexec/usability-misc/sudo-askpass-gui sudoedit --askpass -- "$@"

usr/bin/gsudoedit

@@ -3,44 +3,18 @@
 ## Copyright (C) 2019 - 2025 ENCRYPTED SUPPORT LLC <adrelanos@whonix.org>
 ## See the file COPYING for copying conditions.
 
-set -o errexit
-set -o nounset
-set -o errtrace
-set -o pipefail
+set -e
 
-if [ "$(id -u)" = "0" ]; then
-  ## Administrative ("root") rights already available.
-  ## No need to use a privilege escalation tool such as 'privleap' or 'sudo'.
-  exec /usr/bin/apt-get-update-plus dist-upgrade
-fi
-
-## This is never reached if running 'exec' above.
-
-# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/use_leaprun.sh
-source /usr/libexec/helper-scripts/use_leaprun.sh
-if [ "${use_leaprun}" = 'yes' ]; then
-  exec "${leaprun_exe}" upgrade-nonroot-wrapper
-fi
-
-## In practice, this should "rarely" be reached.
-## Only in case after upgrade, when privleap has not been started yet.
-## In a future version, privleap might auto start after installation.
-## Then this should "never" be reached.
-
-# shellcheck source=../../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.bsh
+# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.bsh
 source /usr/libexec/helper-scripts/package_installed_check.bsh
-if pkg_installed user-sysmaint-split ; then
-  if command -v qubesdb-read >/dev/null 2>&1 ; then
-      1>&2 echo "$0: Cannot run \"apt-get-update-plus dist-upgrade\". Please open a Qubes root console. See: https://www.kicksecure.com/wiki/sysmaint"
-  else
-    kernel_cmdline="$(cat /proc/cmdline)"
-    if ! [[ "${kernel_cmdline}" =~ 'boot-role=sysmaint' ]]; then
-      1>&2 echo "$0: Cannot run \"apt-get-update-plus dist-upgrade\". Please reboot into \"PERSISTENT mode SYSMAINT\" to do this. See: https://www.kicksecure.com/wiki/sysmaint"
-    fi
+
+if pkg_installed user-sysmaint-split; then
+  if [ "$(id -un)" != 'sysmaint' ]; then
+    1>&2 echo "ERROR: upgrade-nonroot cannot be used by accounts other than"
+    1>&2 echo "'sysmaint' on this system. For more information, see"
+    1>&2 echo "https://www.kicksecure.com/wiki/Sysmaint"
+    exit 1
   fi
-  exit 1
 fi
 
-## This is never reached if running 'exec' above.
-
-exec sudo /usr/bin/apt-get-update-plus dist-upgrade
+sudo /usr/bin/apt-get-update-plus dist-upgrade