Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

undo the renaming of output files that previously removed the -squashfs- portion to accomodate the OFS tool (#180)

This commit is contained in:
dman776 2021-11-16 14:25:47 -06:00 committed by GitHub
parent 7163819bf2
commit f0c556941c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -150,15 +150,6 @@ compile: stamp-clean-compiled .stamp-compiled
-name sha256sums -o -name "*.buildinfo" -o -name "*.json" \) \ -name sha256sums -o -name "*.buildinfo" -o -name "*.json" \) \
-print \)`; do rm $$FILE; \ -print \)`; do rm $$FILE; \
done; 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)/scripts/tests-postbuild.sh
$(TOP_DIR)/firmware: $(TOP_DIR)/firmware:

12
files/www/cgi-bin/admin
View File

@ -631,15 +631,15 @@ print <<EOF;
var efn = ""; var efn = "";
if(hwmfg != "cpe"){ if(hwmfg != "cpe"){
if (hwmfg == "wbs") { if (hwmfg == "wbs") {
searchstring= ".*wbs" + hwtype + "-sysupgrade.bin$\"; searchstring= ".*wbs" + hwtype + ".*-sysupgrade.bin$\";
efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}-sysupgrade.bin"; efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}.*-sysupgrade.bin";
} else { } else {
searchstring= ".*(-|_)" + hwtype + "-sysupgrade.bin$\"; searchstring= ".*(-|_)" + hwtype + ".*-sysupgrade.bin$\";
efn = "aredn-$fw_version-$mfgprefix-${hardwaretypev}-sysupgrade.bin"; efn = "aredn-$fw_version-$mfgprefix-${hardwaretypev}.*-sysupgrade.bin";
} }
} else { } else {
searchstring= ".*cpe" + hwtype + "-sysupgrade.bin$\"; searchstring= ".*cpe" + hwtype + ".*-sysupgrade.bin$\";
efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}-sysupgrade.bin"; efn = "aredn-$fw_version-$mfgprefix${hardwaretypev}.*-sysupgrade.bin";
} }
var re = new RegExp(searchstring,"g"); var re = new RegExp(searchstring,"g");
if(elem.value.match(re)){ if(elem.value.match(re)){