Bugfix in openwrt-http.go to handle 23.x ARM release

Somehow I got my notes on file naming conventions mixed up for ARM, which in 23.x matches snapshot (i.e., no "default"). Signed-off-by: Thomas Winkler <[email protected]>
lxc · Oct 17, 2023 · 11b7e66 · 11b7e66
1 parent 04f5021
commit 11b7e66
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/sources/openwrt-http.go b/sources/openwrt-http.go
@@ -75,25 +75,24 @@ func (s *openwrt) Run() error {
 
 	var fname string
 
-	if release == "snapshot" {
+	if strings.HasPrefix(release, "21.02") || strings.HasPrefix(release, "22.03") {
 		switch s.definition.Image.ArchitectureMapped {
 		case "x86_64":
-			fallthrough
+			fname = fmt.Sprintf("openwrt-%s%s-rootfs.tar.gz", releaseInFilename,
+				strings.Replace(architecturePath, "/", "-", 1))
 		case "armv7l":
 			fallthrough
 		case "aarch64":
-			fname = fmt.Sprintf("openwrt-%s%s-rootfs.tar.gz", releaseInFilename,
+			fname = fmt.Sprintf("openwrt-%s%s-default-rootfs.tar.gz", releaseInFilename,
 				strings.Replace(architecturePath, "/", "-", 1))
-		}
 	} else {
 		switch s.definition.Image.ArchitectureMapped {
 		case "x86_64":
-			fname = fmt.Sprintf("openwrt-%s%s-rootfs.tar.gz", releaseInFilename,
-				strings.Replace(architecturePath, "/", "-", 1))
+			fallthrough
 		case "armv7l":
 			fallthrough
 		case "aarch64":
-			fname = fmt.Sprintf("openwrt-%s%s-default-rootfs.tar.gz", releaseInFilename,
+			fname = fmt.Sprintf("openwrt-%s%s-rootfs.tar.gz", releaseInFilename,
 				strings.Replace(architecturePath, "/", "-", 1))
 		}
 	}