build

Author: adrelanos

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

@@ -410,10 +410,12 @@ get_su_cmd(){
 
 test_run_as_target_user() {
   local root_output
-  root_output="$(run_as_target_user timeout --kill-after 5 5 test -d /usr 2>&1)"
+  ## 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 )"
   if test -n "${root_output}"; then
-    log error "'run_as_target_user' output: '${root_output}'"
-    die 1 "${underline}run_as_target_user:${nounderline} Unexpected non-empty output for 'sudo -u ${target_user}' test."
+    die 1 "${underline}run_as_target_user:${nounderline} 'sudo -u ${target_user}' test produced unexpected output: '${root_output}'"
   fi
 }