github-merge-pr: add check for working on clean branch

[maintainer-tools.git] / maketag.sh

diff --git a/maketag.sh b/maketag.sh
index 17ed94a7fa829044cfdf8271fea847f0519eb5e3..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
@@ -86,6 +86,7 @@ revnum="$(./scripts/getver.sh)"
 epoch="$(./scripts/get_source_date_epoch.sh)"
 
 branch="$(git symbolic-ref -q HEAD)"
+distro="OpenWrt"
 
 case "$branch" in
        *-$basever) : ;;
@@ -97,6 +98,11 @@ case "$branch" in
        ;;
 esac
 
+case "$branch" in
+       */lede-*) distro="LEDE" ;;
+       */openwrt-*) distro="OpenWrt" ;;
+esac
+
 export GIT_AUTHOR_NAME="$git_author"
 export GIT_AUTHOR_EMAIL="$git_email"
 export GIT_COMMITTER_NAME="$git_author"
@@ -104,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##*;}")" ;;
@@ -132,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.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
@@ -140,7 +147,7 @@ sed -e 's!http://downloads.openwrt.org/[^"]*!'"$base_url/$version"'!g' \
 echo "$revnum" > version && git add version
 echo "$epoch" > version.date && git add version.date
 
-git commit -sm "OpenWrt v$version: adjust config defaults" \
+git commit -sm "$distro v$version: adjust config defaults" \
        feeds.conf.default \
        include/version.mk \
        package/base-files/image-config.in \
@@ -160,13 +167,13 @@ fi
 
 git ${gpg_script:+-c "gpg.program=$gpg_script"} tag \
        -a "v$version" \
-       -m "OpenWrt v$version Release" \
+       -m "$distro v$version Release" \
        ${gpg_keyid:+-s -u "$gpg_keyid"}
 
 [ -n "$gpg_script" ] && rm -f "$gpg_script"
 
 git revert --no-edit HEAD
-git commit --amend -sm "OpenWrt v$version: revert to branch defaults"
+git commit --amend -sm "$distro v$version: revert to branch defaults"
 
 git --no-pager show "v$version"