github-merge-pr: fix loading .config if symbolic link is used

[maintainer-tools.git] / maketag.sh

diff --git a/maketag.sh b/maketag.sh
index 72767b8bc63b629a81d6b89335775157c2de2972..80e94fa8bfc948d10150ed113e8493711a0cf993 100755 (executable)
--- a/maketag.sh
+++ b/maketag.sh
@@ -4,7 +4,7 @@ git_author="$(git config user.name)"
 git_email="$(git config user.email)"
 gpg_keyid=""
 
-base_url="http://downloads.openwrt.org/releases"
+base_url="https://downloads.openwrt.org/releases"
 
 [ -f "./feeds.conf.default" ] || {
        echo "Please execute as ./${0##*/}" >&2
@@ -110,7 +110,8 @@ export GIT_COMMITTER_EMAIL="$git_email"
 
 while read type name url; do
        case "$type" in
-               src-git)
+               src-git|\
+               src-git-full)
                        case "$url" in
                                *^*)  sha1="${url##*^}" ;;
                                *\;*) sha1="$(git ls-remote "${url%;*}" "${url##*;}")" ;;
@@ -138,7 +139,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