build

Author: adrelanos

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

@@ -410,10 +410,11 @@ get_su_cmd(){
 
 test_run_as_target_user() {
   local root_output
-  ## Catches xtrace and hence variable root_output would be non-empty.
-  #root_output="$(run_as_target_user timeout --kill-after 5 5 test -d /usr 2>&1)"
-  ## Therefore use a subshell and disable xtrace.
-  root_output="$( ( set +x; run_as_target_user timeout --kill-after 5 5 test -d /usr ) 2>&1 )"
+  ## 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)"
+  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}'"
   fi
@@ -965,6 +966,19 @@ if ! command -v stecho &>/dev/null ; then
   }
 fi
 
+disable_xtrace() {
+  if test "${xtrace:-}" = "1"; then
+    set +o xtrace
+  else
+    case "${-}" in
+      *x*)
+        xtrace=1
+        set +o xtrace
+        ;;
+    esac
+  fi
+}
+
 re_enable_xtrace_maybe() {
   if test "${xtrace:-}" = "1"; then
     set -o xtrace
@@ -978,16 +992,7 @@ re_enable_xtrace_maybe() {
 log(){
   : "${log_level:="notice"}"
   ## Avoid clogging output if log() is working alright.
-  if test "${xtrace:-}" = "1"; then
-    set +o xtrace
-  else
-    case "${-}" in
-      *x*)
-        xtrace=1
-        set +o xtrace
-        ;;
-    esac
-  fi
+  disable_xtrace
   log_type="${1:-notice}"
   ## capitalize log level
   log_type_up="$(printf '%s' "${log_type}" | tr "[:lower:]" "[:upper:]")"