diff options
| author | Karel Zak | 2012-03-30 13:43:45 +0200 |
|---|---|---|
| committer | Karel Zak | 2012-03-30 13:44:11 +0200 |
| commit | 916a74389186b7f0d31ed67de84ff555819650c4 (patch) | |
| tree | 4f20bef41e79729f52fc08ccdd4d8012b41f9220 /tools | |
| parent | blkid: add note about variable tags and devices order. (diff) | |
| download | kernel-qcow2-util-linux-916a74389186b7f0d31ed67de84ff555819650c4.tar.gz kernel-qcow2-util-linux-916a74389186b7f0d31ed67de84ff555819650c4.tar.xz kernel-qcow2-util-linux-916a74389186b7f0d31ed67de84ff555819650c4.zip | |
tools: improve ko-release-* scripts
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/ko-release-gen | 5 | ||||
| -rwxr-xr-x | tools/ko-release-push | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tools/ko-release-gen b/tools/ko-release-gen index 92b3f7a58..58f05415d 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 ebeddbb63..f08954fc1 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}" |