From f0c556941ca32b76f0786b93dd8876372bccf909 Mon Sep 17 00:00:00 2001
From: dman776 <dman776@gmail.com>
Date: Tue, 16 Nov 2021 14:25:47 -0600
Subject: [PATCH] undo the renaming of output files that previously removed the
 -squashfs- portion to accomodate the OFS tool (#180)

---
 Makefile                |  9 ---------
 files/www/cgi-bin/admin | 12 ++++++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 18129f00..c8b6b15c 100644
--- a/Makefile
+++ b/Makefile
@@ -150,15 +150,6 @@ compile: stamp-clean-compiled .stamp-compiled
 	  -name sha256sums -o -name "*.buildinfo" -o -name "*.json" \) \
 	  -print \)`; do rm $$FILE; \
 	done;
-	for FILE in `find $(TOP_DIR)/firmware/targets/ -type f -a \
-	  \( -name "*ar71xx-generic-*" \
-	  -o -name "*ath79-generic-*" \
-	  -o -name "*ar71xx-mikrotik*squashfs*" \
-	  \) -print`; do \
-	  NEWNAME="$${FILE/generic-/}"; \
-	  NEWNAME="$${NEWNAME/squashfs-/}"; \
-	  mv "$$FILE" "$$NEWNAME"; \
-	done;
 	$(TOP_DIR)/scripts/tests-postbuild.sh
 
 $(TOP_DIR)/firmware:
diff --git a/files/www/cgi-bin/admin b/files/www/cgi-bin/admin
index 4c391330..6905d08f 100755
--- a/files/www/cgi-bin/admin
+++ b/files/www/cgi-bin/admin
@@ -631,15 +631,15 @@ print <<EOF;
         var efn = "";
         if(hwmfg != "cpe"){
             if (hwmfg == "wbs") {
-                searchstring= ".*wbs" + hwtype + "-sysupgrade.bin$\";
-                efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}-sysupgrade.bin";
+                searchstring= ".*wbs" + hwtype + ".*-sysupgrade.bin$\";
+                efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}.*-sysupgrade.bin";
             } else {
-                searchstring= ".*(-|_)" + hwtype + "-sysupgrade.bin$\";
-                efn = "aredn-$fw_version-$mfgprefix-${hardwaretypev}-sysupgrade.bin";
+                searchstring= ".*(-|_)" + hwtype + ".*-sysupgrade.bin$\";
+                efn = "aredn-$fw_version-$mfgprefix-${hardwaretypev}.*-sysupgrade.bin";
             }
         } else {
-            searchstring= ".*cpe" + hwtype + "-sysupgrade.bin$\";
-            efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}-sysupgrade.bin";
+            searchstring= ".*cpe" + hwtype + ".*-sysupgrade.bin$\";
+            efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}.*-sysupgrade.bin";
         }
         var re = new RegExp(searchstring,"g");   
         if(elem.value.match(re)){