V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

func/1080_helper_chroot.sh

@@ -12,6 +12,13 @@
 
 guard_sourcing
 
+#######################################
+# Use do_in_target() for:
+#   simple commands (e.g., dpkg, ln, mkdir, apt, etc.)
+# Use do_in_target_script() for:
+#   all shell scripts, redirects, pipes, conditions, loops, or subshells
+#######################################
+
 #######################################
 # Wrapper for executing commands in the desired chroot environment.
 # Globals:
@@ -21,24 +28,84 @@ guard_sourcing
 #   1: Target of the chroot environment.
 #   2: Commands and options and parameters to be executed in chroot.
 # Returns:
-#   ERR_CHRT_COMMAND: Unsuccessfully executed commands.
-#   0: Successfully executed commands.
+#   0: on success
+#   ERR_CHRT_COMMAND: on failure
 #######################################
 do_in_target() {
   declare var_chroot_target="$1"
   shift
   declare -a ary_chroot_command=("$@")
+
+  if (( ${#ary_chroot_command[@]} == 0 )); then
+    do_log "emergency" "true" "Empty command passed to 'do_in_target()'."
+    return "${ERR_CHRT_COMMAND}"
+  fi
+
   if chroot "${var_chroot_target}" /usr/bin/env -i \
     HOME=/root \
     PATH=/usr/sbin:/usr/bin:/sbin:/bin \
     TERM="${TERM}" \
     "${ary_chroot_command[@]}"
   then
-    do_log "info" "true" "Success: chroot ${var_chroot_target}: ${ary_chroot_command[*]}"
+    do_log "info" "true" "Success: chroot '${var_chroot_target}': '${ary_chroot_command[*]}'."
     return 0
   else
-    do_log "emergency" "true" "Failed: chroot ${var_chroot_target}: ${ary_chroot_command[*]}"
+    do_log "emergency" "true" "Failed: chroot '${var_chroot_target}': '${ary_chroot_command[*]}'."
     return "${ERR_CHRT_COMMAND}"
   fi
 }
+
+#######################################
+# Execute a full shell script line inside the chroot via bash -c.
+# Supports interactive debug shell on error.
+# Globals:
+#   ERR_CHRT_COMMAND
+#   TERM
+#   DEBUG_INTERACTIVE (optional boolean)
+# Arguments:
+#   1: Target of the chroot environment
+#   2: Command string to execute inside a shell (quoted)
+# Returns:
+#   0: on success
+#   ERR_CHRT_COMMAND: on failure
+#######################################
+do_in_target_script() {
+  declare var_chroot_target="$1"
+  shift
+  declare var_chroot_script="$1"
+
+  if [[ -z "${var_chroot_script}" ]]; then
+    do_log "emergency" "true" "Empty command passed to 'do_in_target_script()'."
+    return "${ERR_CHRT_COMMAND}"
+  fi
+
+  do_log "debug" "true" "Evaluating chroot script in '${var_chroot_target}': '${var_chroot_script}'."
+
+  if chroot "${var_chroot_target}" /usr/bin/env -i \
+    HOME=/root \
+    PATH=/usr/sbin:/usr/bin:/sbin:/bin \
+    TERM="${TERM}" \
+    /bin/bash -c "${var_chroot_script}"
+
+  then
+
+    do_log "info" "true" "Success: chroot '${var_chroot_target}': '${var_chroot_script}'."
+    return 0
+
+  else
+
+    declare -i var_chroot_rc="${?}"
+    do_log "emergency" "true" "Failure: chroot '${var_chroot_target}': '${var_chroot_script}'."
+    do_log "debug" "true" "Return code: '${var_chroot_rc}'."
+
+    # TODO: Tests with Dialog Wrapper in interactive mode.
+    #if [[ "${DEBUG_INTERACTIVE}" == "true" ]]; then
+    #  do_log "warning" "true" "Launching interactive debug shell in chroot: '${var_chroot_target}'."
+    #  chroot "${var_chroot_target}" /bin/bash -l
+    #fi
+
+    return "${ERR_CHRT_COMMAND}"
+
+  fi
+}
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh