Refactor error handling and clean up debug comments

Standardized bash variable checks, removed unnecessary debug and commented code, and clarified error handling logic in container build and setup scripts. These changes improve code readability and maintainability without altering functional behavior.

Author: MickLesk

misc/alpine-install.func

@@ -15,7 +15,7 @@ catch_errors
 verb_ip6() {
   set_std_mode # Set STD mode based on VERBOSE
 
-  if [ "$IPV6_METHOD" == "disable" ]; then
+  if [ "${IPV6_METHOD:-}" = "disable" ]; then
     msg_info "Disabling IPv6 (this may affect some services)"
     $STD sysctl -w net.ipv6.conf.all.disable_ipv6=1
     $STD sysctl -w net.ipv6.conf.default.disable_ipv6=1
@@ -42,7 +42,6 @@ error_handler() {
   local line_number="$2"
   local command="$3"
 
-  # Exitcode 0 = kein Fehler → ignorieren
   if [[ "$exit_code" -eq 0 ]]; then
     return 0
   fi

misc/build.func

@@ -92,7 +92,6 @@ elif command -v wget >/dev/null 2>&1; then
   source <(wget -qO- https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/error_handler.func)
   load_functions
   catch_errors
-  #echo "(build.func) Loaded core.func via wget"
 fi
 
 # ==============================================================================
@@ -2279,7 +2278,7 @@ build_container() {
   none) ;;
   esac
 
-  # Build FEATURES string (simple working version)
+  # Build FEATURES string
   if [ "$CT_TYPE" == "1" ]; then
     FEATURES="keyctl=1,nesting=1"
   else
@@ -2290,9 +2289,7 @@ build_container() {
     FEATURES="$FEATURES,fuse=1"
   fi
 
-  # NEW IMPLEMENTATION (Fixed): Build PCT_OPTIONS properly
-  # Key insight: Bash cannot export arrays, so we build the options as a string
-
+  # Build PCT_OPTIONS as string for export
   TEMP_DIR=$(mktemp -d)
   pushd "$TEMP_DIR" >/dev/null
   if [ "$var_os" == "alpine" ]; then
@@ -2382,11 +2379,6 @@ build_container() {
   export TEMPLATE_STORAGE="${var_template_storage:-}"
   export CONTAINER_STORAGE="${var_container_storage:-}"
 
-  # # DEBUG: Show final PCT_OPTIONS being exported
-  # echo "[DEBUG] PCT_OPTIONS to be exported:"
-  # echo "$PCT_OPTIONS" | sed 's/^/  /'
-  # echo "[DEBUG] Calling create_lxc_container..."
-
   create_lxc_container || exit $?
 
   LXC_CONFIG="/etc/pve/lxc/${CTID}.conf"
@@ -2713,12 +2705,7 @@ EOF'
   install_ssh_keys_into_ct
 
   # Run application installer
-  # NOTE: We disable error handling here because:
-  # 1. Container errors are caught by error_handler INSIDE container
-  # 2. Container creates flag file with exit code
-  # 3. We read flag file and handle cleanup manually below
-  # 4. We DON'T want host error_handler to fire for lxc-attach command itself
-
+  # Disable error trap - container errors are handled internally via flag file
   set +Eeuo pipefail # Disable ALL error handling temporarily
   trap - ERR         # Remove ERR trap completely
 
@@ -2864,7 +2851,6 @@ destroy_lxc() {
 # ------------------------------------------------------------------------------
 # Storage discovery / selection helpers
 # ------------------------------------------------------------------------------
-# ===== Storage discovery / selection helpers (ported from create_lxc.sh) =====
 resolve_storage_preselect() {
   local class="$1" preselect="$2" required_content=""
   case "$class" in
@@ -3249,10 +3235,6 @@ create_lxc_container() {
   # Build regex patterns outside awk/grep for clarity
   SEARCH_PATTERN="^${TEMPLATE_SEARCH}"
 
-  #echo "[DEBUG] TEMPLATE_SEARCH='$TEMPLATE_SEARCH'"
-  #echo "[DEBUG] SEARCH_PATTERN='$SEARCH_PATTERN'"
-  #echo "[DEBUG] TEMPLATE_PATTERN='$TEMPLATE_PATTERN'"
-
   mapfile -t LOCAL_TEMPLATES < <(
     pveam list "$TEMPLATE_STORAGE" 2>/dev/null |
       awk -v search="${SEARCH_PATTERN}" -v pattern="${TEMPLATE_PATTERN}" '$1 ~ search && $1 ~ pattern {print $1}' |
@@ -3263,30 +3245,13 @@ create_lxc_container() {
 
   msg_ok "Template search completed"
 
-  #echo "[DEBUG] pveam available output (first 5 lines with .tar files):"
-  #pveam available -section system 2>/dev/null | grep -E '\.(tar\.zst|tar\.xz|tar\.gz)$' | head -5 | sed 's/^/  /'
-
   set +u
   mapfile -t ONLINE_TEMPLATES < <(pveam available -section system 2>/dev/null | grep -E '\.(tar\.zst|tar\.xz|tar\.gz)$' | awk '{print $2}' | grep -E "${SEARCH_PATTERN}.*${TEMPLATE_PATTERN}" | sort -t - -k 2 -V 2>/dev/null || true)
-  #echo "[DEBUG] After filtering: ${#ONLINE_TEMPLATES[@]} online templates found"
   set -u
 
   ONLINE_TEMPLATE=""
   [[ ${#ONLINE_TEMPLATES[@]} -gt 0 ]] && ONLINE_TEMPLATE="${ONLINE_TEMPLATES[-1]}"
 
-  #msg_debug "SEARCH_PATTERN='${SEARCH_PATTERN}' TEMPLATE_PATTERN='${TEMPLATE_PATTERN}'"
-  #msg_debug "Found ${#LOCAL_TEMPLATES[@]} local templates, ${#ONLINE_TEMPLATES[@]} online templates"
-  if [[ ${#ONLINE_TEMPLATES[@]} -gt 0 ]]; then
-    #msg_debug "First 3 online templates:"
-    count=0
-    for idx in "${!ONLINE_TEMPLATES[@]}"; do
-      #msg_debug "  [$idx]: ${ONLINE_TEMPLATES[$idx]}"
-      ((count++))
-      [[ $count -ge 3 ]] && break
-    done
-  fi
-  #msg_debug "ONLINE_TEMPLATE='$ONLINE_TEMPLATE'"
-
   if [[ ${#LOCAL_TEMPLATES[@]} -gt 0 ]]; then
     TEMPLATE="${LOCAL_TEMPLATES[-1]}"
     TEMPLATE_SOURCE="local"
@@ -3337,7 +3302,6 @@ create_lxc_container() {
         if [[ ${#ONLINE_TEMPLATES[@]} -gt 0 ]]; then
           TEMPLATE="${ONLINE_TEMPLATES[-1]}"
           TEMPLATE_SOURCE="online"
-          #echo "[DEBUG] Found alternative: $TEMPLATE"
         else
           msg_error "No templates available for ${PCT_OSTYPE} ${PCT_OSVERSION}"
           exit 225
@@ -3352,9 +3316,6 @@ create_lxc_container() {
     fi
   fi
 
-  #echo "[DEBUG] Selected TEMPLATE='$TEMPLATE' SOURCE='$TEMPLATE_SOURCE'"
-  #msg_debug "Selected TEMPLATE='$TEMPLATE' SOURCE='$TEMPLATE_SOURCE'"
-
   TEMPLATE_PATH="$(pvesm path $TEMPLATE_STORAGE:vztmpl/$TEMPLATE 2>/dev/null || true)"
   if [[ -z "$TEMPLATE_PATH" ]]; then
     TEMPLATE_BASE=$(awk -v s="$TEMPLATE_STORAGE" '$1==s {f=1} f && /path/ {print $2; exit}' /etc/pve/storage.cfg)

misc/install.func

@@ -51,7 +51,7 @@ catch_errors
 verb_ip6() {
   set_std_mode # Set STD mode based on VERBOSE
 
-  if [ "$IPV6_METHOD" == "disable" ]; then
+  if [ "${IPV6_METHOD:-}" = "disable" ]; then
     msg_info "Disabling IPv6 (this may affect some services)"
     mkdir -p /etc/sysctl.d
     $STD tee /etc/sysctl.d/99-disable-ipv6.conf >/dev/null <<EOF

misc/tools.func

@@ -3238,7 +3238,6 @@ function setup_mongodb() {
     return 1
   }
 
-  # Verify MongoDB was installed correctly
   if ! command -v mongod >/dev/null 2>&1; then
     msg_error "MongoDB binary not found after installation"
     return 1
@@ -3481,14 +3480,11 @@ function setup_nodejs() {
       return 1
     }
 
-    # CRITICAL: Force APT cache refresh AFTER repository setup
-    # This ensures NodeSource is the only nodejs source in APT cache
+    # Force APT cache refresh after repository setup
     $STD apt update
 
-    # Install dependencies (NodeSource is now the only nodejs source)
     ensure_dependencies curl ca-certificates gnupg
 
-    # Install Node.js from NodeSource
     install_packages_with_retry "nodejs" || {
       msg_error "Failed to install Node.js ${NODE_VERSION} from NodeSource"
       return 1
@@ -3639,7 +3635,7 @@ function setup_php() {
   local CURRENT_PHP=""
   CURRENT_PHP=$(is_tool_installed "php" 2>/dev/null) || true
 
-  # CRITICAL: If wrong version is installed, remove it FIRST before any pinning
+  # Remove conflicting PHP version before pinning
   if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
     msg_info "Removing conflicting PHP ${CURRENT_PHP} (need ${PHP_VERSION})"
     stop_all_services "php.*-fpm"
@@ -3786,7 +3782,6 @@ EOF
 
   local INSTALLED_VERSION=$(php -v 2>/dev/null | awk '/^PHP/{print $2}' | cut -d. -f1,2)
 
-  # Critical: if major.minor doesn't match, fail and cleanup
   if [[ "$INSTALLED_VERSION" != "$PHP_VERSION" ]]; then
     msg_error "PHP version mismatch: requested ${PHP_VERSION} but got ${INSTALLED_VERSION}"
     msg_error "This indicates a critical package installation issue"