AIT: Final fixes before release

Signed-off-by: ravindu644 <droidcasts@protonmail.com>

Author: ravindu644

.bin/repack-erofs.sh

@@ -591,7 +591,7 @@ case $FS_CHOICE in
 
         mv "$OUTPUT_IMG.tmp" "$OUTPUT_IMG"
         echo -e "\n${GREEN}${BOLD}Successfully created EROFS image: $OUTPUT_IMG${RESET}"
-        echo -e "${BLUE}Image size: $(stat -c %s "$OUTPUT_IMG" | numfmt --to=iec-i --suffix=B)${RESET}"
+        echo -e "${BLUE}Image size: $(stat -c %s "$OUTPUT_IMG" | numfmt --to=iec-i --suffix=B)${RESET}\n"
         ;;
 
     ext4)
@@ -677,7 +677,7 @@ case $FS_CHOICE in
         [ -n "$SUDO_USER" ] && chown "$SUDO_USER:$SUDO_USER" "$OUTPUT_IMG"
 
         echo -e "\n${GREEN}${BOLD}Successfully created EXT4 image: $OUTPUT_IMG${RESET}"
-        echo -e "${BLUE}Image size: $(stat -c %s "$OUTPUT_IMG" | numfmt --to=iec-i --suffix=B)${RESET}"
+        echo -e "${BLUE}Image size: $(stat -c %s "$OUTPUT_IMG" | numfmt --to=iec-i --suffix=B)${RESET}\n"
         ;;
 
     *)

.bin/super-tools.sh

@@ -262,36 +262,38 @@ run_repack() {
     echo -e "\n${GREEN}${BOLD}Repack successful!${RESET}"
 }
 
-
-# --- START OF NEW, ROBUST MAIN EXECUTION LOGIC ---
+# --- MAIN EXECUTION LOGIC ---
 
 # Initialize variables for arguments and flags
 ACTION=""
-ARGS=()
+POSITIONAL_ARGS=()
 INTERACTIVE_MODE=true
 
-# Parse arguments and flags
+# This loop correctly separates global flags from positional arguments,
+# regardless of their order.
 while (( "$#" )); do
   case "$1" in
     --no-banner)
       INTERACTIVE_MODE=false
-      shift
+      shift # Consume the flag
       ;;
     -*)
-      echo -e "${RED}Error: Unknown option $1${RESET}" >&2
+      echo -e "${RED}Error: Unknown global option $1${RESET}" >&2
       print_usage
       ;;
     *)
-      if [ -z "$ACTION" ]; then
-        ACTION="$1"
-      else
-        ARGS+=("$1")
-      fi
-      shift
+      # Not a flag, so it must be a positional argument.
+      POSITIONAL_ARGS+=("$1")
+      shift # Consume the argument
       ;;
   esac
 done
 
+# Now, POSITIONAL_ARGS contains only the action and its own arguments
+ACTION=${POSITIONAL_ARGS[0]:-}
+# Use array slicing to get the true arguments for the action
+ACTION_ARGS=("${POSITIONAL_ARGS[@]:1}")
+
 # Validate action
 if [ "$ACTION" != "unpack" ] && [ "$ACTION" != "repack" ]; then
     if [ "$INTERACTIVE_MODE" = true ]; then print_banner; fi
@@ -300,12 +302,12 @@ if [ "$ACTION" != "unpack" ] && [ "$ACTION" != "repack" ]; then
 fi
 
 # Validate argument counts for each action
-if [ "$ACTION" == "unpack" ] && [ "${#ARGS[@]}" -ne 2 ]; then
+if [ "$ACTION" == "unpack" ] && [ "${#ACTION_ARGS[@]}" -ne 2 ]; then
     if [ "$INTERACTIVE_MODE" = true ]; then print_banner; fi
     echo -e "${RED}Error: 'unpack' requires exactly 2 arguments: <super_image> and <output_directory>.${RESET}"
     print_usage
 fi
-if [ "$ACTION" == "repack" ] && { [ "${#ARGS[@]}" -ne 2 ] && [ "${#ARGS[@]}" -ne 3 ]; }; then
+if [ "$ACTION" == "repack" ] && { [ "${#ACTION_ARGS[@]}" -ne 2 ] && [ "${#ACTION_ARGS[@]}" -ne 3 ]; }; then
     if [ "$INTERACTIVE_MODE" = true ]; then print_banner; fi
     echo -e "${RED}Error: 'repack' requires 2 arguments with an optional '--raw' flag.${RESET}"
     print_usage
@@ -319,10 +321,10 @@ check_dependencies
 
 case "$ACTION" in
     unpack)
-        run_unpack "${ARGS[0]}" "${ARGS[1]}"
+        run_unpack "${ACTION_ARGS[@]}"
         ;;
     repack)
-        run_repack "${ARGS[0]}" "${ARGS[1]}" "${ARGS[2]}"
+        run_repack "${ACTION_ARGS[@]}"
         ;;
 esac
 

android_image_tools.sh

@@ -615,7 +615,7 @@ run_super_unpack_interactive() {
     read -rp $'\nPress Enter to return...'
 }
 
-# --- MODIFIED: run_super_create_config_interactive now handles percentage overhead ---
+# --- MODIFIED: run_super_create_config_interactive now asks for logging preference ---
 run_super_create_config_interactive() {
 
     local project_dir metadata_dir final_config_file
@@ -700,12 +700,26 @@ run_super_create_config_interactive() {
         done
     done
 
+    clear; print_banner
+    echo -e "\n${BOLD}Final Configuration Step${RESET}"
+    select_option "Enable detailed, real-time logs during super repack?" \
+        "Yes (Recommended for debugging)" \
+        "No (Show a clean spinner)"
+    
+    local enable_verbose_logs="false"
+    if [ "$AIT_CHOICE_INDEX" -eq 0 ]; then
+        enable_verbose_logs="true"
+    fi
+    
     {
         echo "# --- Universal Repack Configuration ---"
         echo "# Project: $(basename "$project_dir")"
         echo "# Generated on $(date)"
         echo "# WARNING: Do NOT edit this file manually unless you know what you are doing."
         echo ""
+        echo "# --- Repack Behavior Settings ---"
+        echo "ENABLE_VERBOSE_LOGS=${enable_verbose_logs}"
+        echo ""
         echo "# --- Super Partition Metadata ---"
         grep -v -E '^(#|$)' "${metadata_dir}/super_repack_info.txt"
         echo ""
@@ -733,7 +747,7 @@ run_super_create_config_interactive() {
     read -rp $'\nPress Enter to return...'
 }
 
-# --- MODIFIED: run_super_repack_interactive now passes percentage overhead ---
+# --- MODIFIED: run_super_repack_interactive now supports conditional logging ---
 run_super_repack_interactive() {
 
     local project_dir metadata_dir part_config_file logical_dir extracted_dir
@@ -773,7 +787,6 @@ run_super_repack_interactive() {
     set +e # Disable exit on error for the loop
     local total=$(echo "$PARTITION_LIST" | wc -w)
     local current=0
-    local spinner=( '⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏' )
     local all_successful=true
 
     echo -e "\n${BLUE}--- Repacking content into logical partitions ---${RESET}"
@@ -794,23 +807,40 @@ run_super_repack_interactive() {
             fi
         fi
 
-        bash "$REPACK_SCRIPT_PATH" "${project_dir}/extracted_content/${part_name}" "${logical_dir}/${part_name}.img" "${repack_args[@]}" --no-banner >/dev/null 2>&1 &
-        local pid=$!
-
-        while kill -0 $pid 2>/dev/null; do
-            echo -ne "\r\033[K${YELLOW}(${current}/${total}) Repacking: ${BOLD}${part_name}${RESET}... ${spinner[$((spin++ % 10))]}"
-            sleep 0.1
-        done
-
-        wait $pid
-        if [ $? -ne 0 ]; then
-            echo -e "\r\033[K${RED}(${current}/${total}) FAILED to repack: ${BOLD}${part_name}${RESET} [✗]"
-            all_successful=false
-            break
+        # Use a default of 'false' if the variable isn't in the config file
+        if [ "${ENABLE_VERBOSE_LOGS:-false}" == "true" ]; then
+            # --- VERBOSE LOGGING PATH ---
+            echo -e "\n${YELLOW}--- (${current}/${total}) Repacking: ${BOLD}${part_name}${RESET} ---${RESET}"
+            bash "$REPACK_SCRIPT_PATH" "${project_dir}/extracted_content/${part_name}" "${logical_dir}/${part_name}.img" "${repack_args[@]}" --no-banner
+            
+            if [ $? -ne 0 ]; then
+                echo -e "${RED}--- [✗] FAILED: ${BOLD}${part_name}${RESET} repack failed. See logs above. ---${RESET}"
+                all_successful=false
+                break
+            else
+                echo -e "${GREEN}--- [✓] Success: ${BOLD}${part_name}${RESET} repacked ---${RESET}"
+            fi
         else
-            echo -e "\r\033[K${GREEN}(${current}/${total}) Repacked:  ${BOLD}${part_name}${RESET} [✓]"
+            # --- SILENT SPINNER PATH ---
+            bash "$REPACK_SCRIPT_PATH" "${project_dir}/extracted_content/${part_name}" "${logical_dir}/${part_name}.img" "${repack_args[@]}" --no-banner >/dev/null 2>&1 &
+            local pid=$!
+            local spin=0
+            local spinner=( '⠋' '⠙' '⠹' '⠸' '⠼' '⠴' '⠦' '⠧' '⠇' '⠏' )
+
+            while kill -0 $pid 2>/dev/null; do
+                echo -ne "\r\033[K${YELLOW}(${current}/${total}) Repacking: ${BOLD}${part_name}${RESET}... ${spinner[$((spin++ % 10))]}"
+                sleep 0.1
+            done
+
+            wait $pid
+            if [ $? -ne 0 ]; then
+                echo -e "\r\033[K${RED}(${current}/${total}) FAILED to repack: ${BOLD}${part_name}${RESET} [✗]"
+                all_successful=false
+                break
+            else
+                echo -e "\r\033[K${GREEN}(${current}/${total}) Repacked:  ${BOLD}${part_name}${RESET} [✓]"
+            fi
         fi
-
     done
 
     if [ "$all_successful" = false ]; then
@@ -820,10 +850,23 @@ run_super_repack_interactive() {
     fi
 
     echo -e "\n${BLUE}--- Assembling final super image ---${RESET}"
+    
+    set -e
     bash "$SUPER_SCRIPT_PATH" repack "$logical_dir" "$output_image" "$sparse_flag" --no-banner
 
-    rm -rf "$logical_dir"
+    # Check the exit code of the last command explicitly
+    if [ $? -ne 0 ]; then
+        # This block will now correctly execute if super-tools.sh fails
+        echo -e "\n${RED}${BOLD}FATAL: Failed to assemble the final super image. Please check the errors above.${RESET}"
+        # Restore the original trap and exit
+        trap 'cleanup_and_exit' INT TERM EXIT
+        read -rp $'\nPress Enter to return...'
+        return
+    fi
+
     set +e
+    
+    rm -rf "$logical_dir"
     trap 'cleanup_and_exit' INT TERM EXIT
 
     echo -e "\n${GREEN}${BOLD}Super repack successful!${RESET}"