Since OpenWrt 21.02 we use https for our download server, detect these
URLs too.

Signed-off-by: Hauke Mehrtens <[email protected]>
---

To use the https URLs I have to provide the URL manually now:
./maketag.sh -k F1B767859CB2EBC7 -v 21.02.0-rc1 -u 
https://downloads.openwrt.org/releases


 makebranch.sh | 2 +-
 maketag.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/makebranch.sh b/makebranch.sh
index e8472d7..4b3ab77 100755
--- a/makebranch.sh
+++ b/makebranch.sh
@@ -133,7 +133,7 @@ sed -e 's!^RELEASE:=.*!RELEASE:='"$codename"'!g' \
        include/version.mk > include/version.branch && \
                mv include/version.branch include/version.mk
 
-sed -e 
's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g'
 \
+sed -e 
's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version-SNAPSHOT"'!g'
 \
        package/base-files/image-config.in > 
package/base-files/image-config.branch && \
                mv package/base-files/image-config.branch 
package/base-files/image-config.in
 
diff --git a/maketag.sh b/maketag.sh
index 72767b8..5152411 100755
--- a/maketag.sh
+++ b/maketag.sh
@@ -138,7 +138,7 @@ sed -e 's!\(VERSION_NUMBER:=\$(if 
.*\),[^,]*)!\1,'"$version"')!g' \
        include/version.mk > include/version.tagged && \
                mv include/version.tagged include/version.mk
 
-sed -e 
's!http://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g'
 \
+sed -e 
's!\(http\|https\)://downloads.\(openwrt\|lede-project\).org/[^"]*!'"$base_url/$version"'!g'
 \
     -e '/config VERSION_CODE_FILENAMES/ { :next; n; s!default y!default n!; t 
end; b next }; :end' \
        package/base-files/image-config.in > 
package/base-files/image-config.tagged && \
                mv package/base-files/image-config.tagged 
package/base-files/image-config.in
-- 
2.30.2


_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to