From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Mon, 19 Apr 2021 19:23:30 +0000 (+0200)
Subject: maketag.sh/makebranch.sh: handle https download URLs
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=615e6649d3ab672fe33aa3480d73681402074446;p=maintainer-tools.git

maketag.sh/makebranch.sh: handle https download URLs

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

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

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