From: Karel Zak <kzak@redhat.com>
Date: Fri, 30 Mar 2012 11:43:45 +0000 (+0200)
Subject: tools: improve ko-release-* scripts
X-Git-Tag: v2.22-rc1~606
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=916a74389186b7f0d31ed67de84ff555819650c4;p=thirdparty%2Futil-linux.git

tools: improve ko-release-* scripts

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tools/ko-release-gen b/tools/ko-release-gen
index 92b3f7a58e..58f05415d6 100755
--- a/tools/ko-release-gen
+++ b/tools/ko-release-gen
@@ -23,7 +23,8 @@ cd "$(git rev-parse --show-toplevel)" || {
 	echo "error: cannot found version file (call make distcheck)"
 
 VERSION=$(cat .version)
-VERSION_MAJOR=$(echo $VERSION | sed 's/-rc[0-9]//')
+VERSION_MAJOR=$(echo $VERSION | sed 's/-rc[0-9]//; s/\(.*\..*\)\..*/\1/')
+VERSION_DOCS=$(echo $VERSION | sed 's/-rc[0-9]//')
 DISTDIR=${1:-"kernel.org"}/v${VERSION_MAJOR}
 
 GPG_CMD="gpg --use-agent --armor --detach-sign --quiet"
@@ -80,7 +81,7 @@ eval $(gpg-agent --daemon)
 
 add_file	util-linux-${VERSION}.tar.xz
 add_file	v${VERSION}-ChangeLog
-add_file	Documentation/releases/v${VERSION_MAJOR}-ReleaseNotes
+add_file	Documentation/releases/v${VERSION_DOCS}-ReleaseNotes
 add_html_dir	libmount/docs/html libmount-docs
 add_html_dir	libblkid/docs/html libblkid-docs
 
diff --git a/tools/ko-release-push b/tools/ko-release-push
index ebeddbb632..f08954fc14 100755
--- a/tools/ko-release-push
+++ b/tools/ko-release-push
@@ -20,7 +20,7 @@ cd "$(git rev-parse --show-toplevel)" || {
 	echo "error: cannot found version file (call make distcheck)"
 
 VERSION=${2:-$(cat .version)}
-VERSION_MAJOR=$(echo $VERSION | sed 's/-rc[0-9]//')
+VERSION_MAJOR=$(echo $VERSION | sed 's/-rc[0-9]//; s/\(.*\..*\)\..*/\1/')
 BASEDIR=${1:-"kernel.org"}
 DISTDIR="${BASEDIR}/v${VERSION_MAJOR}"