Merge branch 'master' into arraybolt3/trixie

Author: ArrayBolt3

changelog.upstream

@@ -1,3 +1,51 @@
+commit 09a9ca3335066150caf9bbf0749b410016b7f68c
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 01:40:19 2025 -0500
+
+    build
+
+commit 18f4fd0f275734040b5dafe83b810b29f2fccae0
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 01:39:36 2025 -0500
+
+    sanity test
+
+commit 0e06495156ddb350ad5d602e8ca95d68e04d6aaf
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 01:34:43 2025 -0500
+
+    sanity test
+
+commit ff05a6c1fc8f8f0afcdb1762200fa2bcf2316173
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 06:23:23 2025 +0000
+
+    bumped changelog version
+
+commit 9a77741140d0e3691c8323658de3205a5a1ef7ce
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 00:55:09 2025 -0500
+
+    refactoring
+
+commit b4ec9848808289576a36204346014c3cf869d212
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 00:52:03 2025 -0500
+
+    build
+
+commit a340d35cdc895afa0df32757f37db1530fdad8dc
+Author: Patrick Schleizer <[email protected]>
+Date:   Fri Nov 14 00:51:37 2025 -0500
+
+    refactoring
+
+commit db7ca3f878a92e0d795f249e89a97a312373b07d
+Author: Patrick Schleizer <[email protected]>
+Date:   Thu Nov 13 12:20:23 2025 +0000
+
+    bumped changelog version
+
 commit 02f6353ee46b7bdde15f1cd19211b5cdd8a138e6
 Author: Patrick Schleizer <[email protected]>
 Date:   Thu Nov 13 07:19:04 2025 -0500

debian/changelog

@@ -1,3 +1,15 @@
+usability-misc (3:33.5-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <[email protected]>  Fri, 14 Nov 2025 06:56:52 +0000
+
+usability-misc (3:33.4-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <[email protected]>  Fri, 14 Nov 2025 06:23:23 +0000
+
 usability-misc (3:33.3-1) unstable; urgency=medium
 
   * New upstream version (local package).

testscript

@@ -4,7 +4,7 @@ set -e
 
 source usr/bin/dist-installer-cli
 
-target_user=root
+set_target_user_account root
 
 test_file -f /etc/hostname
 test_file -d /
@@ -17,3 +17,8 @@ if ! test_file -f /nonexisting; then
 else
    exit 1
 fi
+
+test_run_as_target_user
+
+true "$0: END"
+

usr/bin/dist-installer-cli

@@ -197,8 +197,8 @@ source /usr/libexec/helper-scripts/wc-test.sh
 # shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/get_colors.sh
 source /usr/libexec/helper-scripts/get_colors.sh
 
-# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.bsh
-source /usr/libexec/helper-scripts/package_installed_check.bsh
+# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.sh
+source /usr/libexec/helper-scripts/package_installed_check.sh
 
 ########################
 ## END DEFAULT VALUES ##
@@ -4059,6 +4059,10 @@ set_default() {
 set_target_user_account() {
   target_user="${1:-}"
 
+  if ! id --user -- "${target_user}" >/dev/null; then
+    die 1 "target_user '${target_user}' does not exist!"
+  fi
+
   if [ "${sucmd}" != 'sudo' ]; then
     log warn "Privilege escalation utilities other than 'sudo' for installing to an alternate user account or running under account 'sysmaint' is untested."
   fi

usr/libexec/usability-misc/avoid-needless-polkit-agent

@@ -8,9 +8,7 @@ set -o nounset
 set -o errtrace
 set -o pipefail
 
-source /usr/libexec/helper-scripts/package_installed_check.bsh
-
-if ! pkg_installed user-sysmaint-split ; then
+if ! package-installed-check user-sysmaint-split ; then
   exit 0
 fi
 

usr/share/usability-misc/dist-installer-cli-standalone

@@ -256,9 +256,9 @@ if test "${get_colors_sourced:-}" != "1"; then
 fi
 ##### END pasted by build-dist-installer-cli from file /usr/libexec/helper-scripts/get_colors.sh
 
-# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.bsh
-##### BEGIN pasted by build-dist-installer-cli from file /usr/libexec/helper-scripts/package_installed_check.bsh
-#!/bin/bash
+# shellcheck source=../../../helper-scripts/usr/libexec/helper-scripts/package_installed_check.sh
+##### BEGIN pasted by build-dist-installer-cli from file /usr/libexec/helper-scripts/package_installed_check.sh
+#!/bin/sh
 
 ## Copyright (C) 2025 - 2025 ENCRYPTED SUPPORT LLC <[email protected]>
 ## See the file COPYING for copying conditions.
@@ -278,6 +278,7 @@ pkg_installed() {
    ## install ok installed
 
    requested_action=$(printf '%s' "$dpkg_query_output" | awk '{print $1}')
+   # shellcheck disable=SC2034
    status=$(printf '%s' "$dpkg_query_output" | awk '{print $2}')
    # shellcheck disable=SC2034
    error_state=$(printf '%s' "$dpkg_query_output" | awk '{print $3}')
@@ -290,17 +291,7 @@ pkg_installed() {
    true "$0: INFO: $package_name is not installed, ok."
    return 1
 }
-
-if [ "${BASH_SOURCE}" = "${0}" ]; then
-  ## Script was executed.
-  ## This is useful to allow non-Bash shell scripts to use this functionality.
-  set -o errexit
-  set -o nounset
-  set -o errtrace
-  set -o pipefail
-  pkg_installed "$1"
-fi
-##### END pasted by build-dist-installer-cli from file /usr/libexec/helper-scripts/package_installed_check.bsh
+##### END pasted by build-dist-installer-cli from file /usr/libexec/helper-scripts/package_installed_check.sh
 
 ########################
 ## END DEFAULT VALUES ##
@@ -462,7 +453,7 @@ test_run_as_target_user() {
   ## root_output would catch xtrace and hence variable root_output would be non-empty.
   ## Therefore disabling xtrace.
   disable_xtrace
-  root_output="$(run_as_target_user timeout --kill-after 5 5 test -d /usr 2>&1)"
+  xtrace_force_no_re_enable=true root_output="$(run_as_target_user timeout --kill-after 5 5 test -d /usr 2>&1)"
   re_enable_xtrace_maybe
   if test -n "${root_output}"; then
     die 1 "${underline}run_as_target_user:${nounderline} 'sudo -u ${target_user}' test produced unexpected output: '${root_output}'"
@@ -1029,6 +1020,9 @@ disable_xtrace() {
 }
 
 re_enable_xtrace_maybe() {
+  if [ "${xtrace_force_no_re_enable:-}" = "true" ]; then
+    return 0
+  fi
   if test "${xtrace:-}" = "1"; then
     set -o xtrace
   fi
@@ -4891,6 +4885,10 @@ set_default() {
 set_target_user_account() {
   target_user="${1:-}"
 
+  if ! id --user -- "${target_user}" >/dev/null; then
+    die 1 "target_user '${target_user}' does not exist!"
+  fi
+
   if [ "${sucmd}" != 'sudo' ]; then
     log warn "Privilege escalation utilities other than 'sudo' for installing to an alternate user account or running under account 'sysmaint' is untested."
   fi