fix: add support for arch subfolders (fix #40)

Author: pimlie

ubuntu-mainline-kernel.sh

@@ -591,12 +591,6 @@ Optional:
             warn "Disable signature check, gpg not available"
         }
 
-        if [ $check_signature -eq 0 ]; then
-            FILES=()
-        else
-            FILES=("CHECKSUMS" "CHECKSUMS.gpg")
-        fi
-
         IFS=$'\n'
 
         ppa_uri=$ppa_index${version%\.0}"/"
@@ -609,8 +603,23 @@ Optional:
           exit 1
         fi
 
-        index=${index##*<table}
+        index=${index%%*<table}
+
+        FILES=()
+
+        found_arch=0
+        uses_subfolders=0
+        section_end="^[[:space:]]*<br>[[:space:]]*$"
         for line in $index; do
+            if [[ $line =~ $build_succeeded_text ]]; then
+              found_arch=1
+              continue
+            elif [ $found_arch -eq 0 ]; then
+              continue
+            elif [[ $line =~ $section_end ]]; then
+              break
+            fi
+
             [[ "$line" =~ linux-(image(-(un)?signed)?|headers|modules)-[0-9]+\.[0-9]+\.[0-9]+-[0-9]{6}.*?_(${arch}|all).deb ]] || continue
 
             [ $use_lowlatency -eq 0 ] && [[ "$line" =~ "-lowlatency" ]] && continue
@@ -623,10 +632,22 @@ Optional:
             line=${line##*href=\"}
             line=${line%%\">*}
 
+            if [ $uses_subfolders -eq 0 ] && [[ $line =~ ${arch}/linux ]]; then
+              uses_subfolders=1
+            fi
+
             FILES+=("$line")
         done
         unset IFS
 
+        if [ $check_signature -eq 1 ]; then
+            if [ $uses_subfolders -eq 0 ]; then
+              FILES+=("CHECKSUMS" "CHECKSUMS.gpg")
+            else
+              FILES+=("${arch}/CHECKSUMS" "${arch}/CHECKSUMS.gpg")
+            fi
+        fi
+
         if [ ${#FILES[@]} -ne $expected_files_count ]; then
             if [ $assume_yes -eq 0 ]; then
                 logn "Expected to need to download $expected_files_count files but found ${#FILES[@]}, continue? (y/N)"
@@ -642,14 +663,15 @@ Optional:
         debs=()
         log "Will download ${#FILES[@]} files from $ppa_host:"
         for file in "${FILES[@]}"; do
-            monitor_progress "Downloading $file" "$workdir$file"
-            download $ppa_host "$ppa_uri$file" > "$workdir$file"
+            workfile=${file##*/}
+            monitor_progress "Downloading $file" "$workdir$workfile"
+            download $ppa_host "$ppa_uri$file" > "$workdir$workfile"
 
-            remove_http_headers "$workdir$file"
+            remove_http_headers "$workdir$workfile"
             end_monitor_progress
 
-            if [[ "$file" =~ \.deb ]]; then
-                debs+=("$file")
+            if [[ "$workfile" =~ \.deb ]]; then
+                debs+=("$workfile")
             fi
         done