build

Author: adrelanos

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

@@ -453,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}'"
@@ -1020,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
@@ -4882,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