fix(automation-tools): fixed library search from ldd and filtered out /tmp /home /run local path for searching.

XargonWan · XargonWan · commit f06973caed23 · 2025-08-29T13:58:08.000+09:00
diff --git a/automation-tools/assembler.sh b/automation-tools/assembler.sh
@@ -1065,35 +1065,59 @@ process_library_file() {
     # Clear output file
     > "$output_file"
     
+    # Load filtered patterns from filtered_libs.txt
+    local filtered_libs_file="$(dirname "$0")/../filtered_libs.txt"
+    local filtered_patterns=()
+    if [[ -f "$filtered_libs_file" ]]; then
+        while IFS= read -r fline; do
+            [[ -z "$fline" || "$fline" =~ ^[[:space:]]*# ]] && continue
+            filtered_patterns+=("$fline")
+        done < "$filtered_libs_file"
+    fi
+
     while IFS= read -r line; do
         # Skip empty lines and comments
         [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
-        
-        # Check if line looks like ldd output
-        if [[ "$line" =~ ^[[:space:]]*([^[:space:]]+)[[:space:]]=\>[[:space:]]*(not\ found|/.*)[[:space:]]*(\(.*\))?$ ]]; then
-            # Extract library name from ldd output (standard format: name => path)
-            local lib_name="${BASH_REMATCH[1]}"
-            echo "$lib_name" >> "$output_file"
-            log i "📚 Found library from ldd: $lib_name" "$logfile"
+
+        local lib_name=""
+        # Migliorata: estrai nome completo con versione (es: libzip.so.5)
+        if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_\-]+\.so(\.[0-9]+)*)([[:space:]]|=\u003e).* ]]; then
+            lib_name="${BASH_REMATCH[1]}"
+            extracted_from_ldd=true
         elif [[ "$line" =~ ^[[:space:]]*(/[^[:space:]]+)[[:space:]]+(\(.*\))$ ]]; then
-            # Extract library name from ldd output (dynamic linker format: /path (address))
-            local lib_path="${BASH_REMATCH[1]}"
-            local lib_name=$(basename "$lib_path")
-            echo "$lib_name" >> "$output_file"
-            log i "🔗 Found dynamic linker from ldd: $lib_name" "$logfile"
-        elif [[ "$line" =~ ^[[:space:]]*([^[:space:]]+\.(so|so\.[0-9]+(\.[0-9]+)*)).*$ ]]; then
-            # Direct library name
-            local lib_name="${BASH_REMATCH[1]}"
-            echo "$lib_name" >> "$output_file"
-            log i "📚 Found library: $lib_name" "$logfile"
+            lib_path="${BASH_REMATCH[1]}"
+            lib_name=$(basename "$lib_path")
+        elif [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_\-]+\.so(\.[0-9]+)*).*$ ]]; then
+            lib_name="${BASH_REMATCH[1]}"
         elif [[ "$line" =~ ^[[:space:]]*plugins/ ]]; then
-            # Plugin directory - pass through as is
             echo "$line" >> "$output_file"
-            log i "🔌 Found plugin directory: $line" "$logfile"
+            log i "� Found plugin directory: $line" "$logfile"
+            continue
         else
-            # Unknown format, log warning but continue
             log w "❓ Unrecognized library format: $line" "$logfile"
+            continue
+        fi
+
+        # Check if library is filtered
+        local is_filtered=false
+        for pattern in "${filtered_patterns[@]}"; do
+            if [[ "$lib_name" == $pattern ]]; then
+                log w "⏭️  Skipping $lib_name as it's filtered in filtered_libs.txt" "$logfile"
+                is_filtered=true
+                break
+            fi
+        done
+        if [[ "$is_filtered" == true ]]; then
+            continue
+        fi
+
+        echo "$lib_name" >> "$output_file"
+        if [[ "$extracted_from_ldd" == true ]]; then
+            log i "📚 Extracted library from ldd dump: $lib_name" "$logfile"
+        else
+            log i "📚 Found library: $lib_name" "$logfile"
         fi
+        extracted_from_ldd=false
     done < "$input_file"
     
     log d "✅ Processed component library file, output written to: $output_file" "$logfile"
diff --git a/automation-tools/search_libs.sh b/automation-tools/search_libs.sh
@@ -10,8 +10,16 @@ search_libs() {
     # Use absolute paths to avoid confusion
     local component_lib_dir="$(realpath -m "${FLATPAK_DEST}/../lib" 2>/dev/null)"
     local artifacts_lib_dir="$(realpath -m "${FLATPAK_DEST}/lib")"
-    
-    SEARCH_PATHS=("$artifacts_lib_dir" "$component_lib_dir" /app /usr/lib /usr/lib64)
+
+    # Add squashfs-root (AppImage extracted) if present
+    local squashfs_root_dir="${component}/squashfs-root"
+    local squashfs_lib_dir="${squashfs_root_dir}/lib"
+    if [[ -d "$squashfs_root_dir" ]]; then
+        SEARCH_PATHS=("$artifacts_lib_dir" "$component_lib_dir" "$squashfs_lib_dir" "$squashfs_root_dir" "$squashfs_root_dir/usr/lib" /app /usr/lib /usr/lib64)
+    else
+        SEARCH_PATHS=("$artifacts_lib_dir" "$component_lib_dir" /app /usr/lib /usr/lib64)
+    fi
+    # Exclude /run from search
     mkdir -p "${FLATPAK_DEST}/lib/"
 
     lib_list="$1"
@@ -24,21 +32,58 @@ search_libs() {
     # Load libraries from the provided list
     log d "🔍 Searching for libraries from: \"$lib_list\"..." "$logfile"
     mapfile -t all_libs < <(grep -v '^\s*#' "$lib_list" | sort -u)
+
+    # Load filtered patterns from filtered_libs.txt
+    local filtered_libs_file="$(dirname "$0")/../filtered_libs.txt"
+    local filtered_patterns=()
+    if [[ -f "$filtered_libs_file" ]]; then
+        while IFS= read -r line; do
+            [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
+            filtered_patterns+=("$line")
+        done < "$filtered_libs_file"
+    fi
     log i "📦 Loaded ${#all_libs[@]} libraries from list" "$logfile"
 
     need_to_debug=false
     not_found_libs=()
 
     for lib in "${all_libs[@]}"; do
+        # Salta la ricerca se la libreria è filtrata
+        local is_filtered=false
+        for pattern in "${filtered_patterns[@]}"; do
+            if [[ "$lib" == $pattern ]]; then
+                echo "⏭️  Skipping $lib as it's filtered in filtered_libs.txt"
+                is_filtered=true
+                break
+            fi
+        done
+        if [[ "$is_filtered" == true ]]; then
+            continue
+        fi
         # Check if library is already present in artifacts (from AppImage extraction)
         if [[ -f "${FLATPAK_DEST}/lib/$lib" ]]; then
             echo "📦 Using native library from component: $lib (skipping external copy)"
             continue
         fi
-        
-        path=$(find "${SEARCH_PATHS[@]}" -type f -name "$lib" 2>/dev/null | head -n 1)
+        echo "[DEBUG] Searching for $lib in paths:"
+        for search_path in "${SEARCH_PATHS[@]}"; do
+            echo "  - $search_path"
+        done
+        path=$(find "${SEARCH_PATHS[@]}" -type f -name "$lib" \
+            ! -path "/run/*" \
+            ! -path "/home/*" \
+            ! -path "/tmp/*" 2>/dev/null | tee /tmp/search_libs_debug.log | head -n 1)
+        if [ -n "$path" ]; then
+            echo "[DEBUG] Found $lib at: $path"
+        fi
         if [ -z "$path" ]; then
-            path=$(find "${SEARCH_PATHS[@]}" -type f -iname "*$lib*" 2>/dev/null | head -n 1)
+            path=$(find "${SEARCH_PATHS[@]}" -type f -iname "*$lib*" \
+                ! -path "/run/*" \
+                ! -path "/home/*" \
+                ! -path "/tmp/*" 2>/dev/null | tee -a /tmp/search_libs_debug.log | head -n 1)
+            if [ -n "$path" ]; then
+                echo "[DEBUG] Found $lib (variant) at: $path"
+            fi
             if [ -z "$path" ]; then
                 # Special handling: if libopenh264.so.7 is requested, create symlink from .2.5.1 if available
                 if [ "$lib" == "libopenh264.so.7" ] && [ -f "${FLATPAK_DEST}/lib/libopenh264.so.2.5.1" ]; then
@@ -51,7 +96,6 @@ search_libs() {
                 continue
             fi
         fi
-
         dest="${FLATPAK_DEST}/lib/$(basename "$path")"
         if [ "$path" != "$dest" ]; then
             cp -fL "$path" "${FLATPAK_DEST}/lib/"
