summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2014-06-25 13:54:06 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2014-06-25 13:54:37 +1000
commit90f56fd598ceb753d2a045f5344cd333c5d8e11a (patch)
tree02b2bc477d955b20aa5f7738f7d142c5eefc84fe
parentaa691257dd32a78ffc3de928759fb89f68f798a5 (diff)
release.sh: fix a couple of missing tag_name vs tar_name substitutions
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rwxr-xr-xrelease.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/release.sh b/release.sh
index 6909225..8e1af53 100755
--- a/release.sh
+++ b/release.sh
@@ -97,7 +97,7 @@ Cc: $list_cc
`git log --no-merges "$tag_range" | git shortlog`
-git tag: $tar_name
+git tag: $tag_name
RELEASE
@@ -602,16 +602,16 @@ process_module() {
# Pushing the top commit tag to the remote repository
if [ x$DRY_RUN = x ]; then
- echo "Info: pushing tag \"$tar_name\" to remote \"$remote_name\":"
- git push $remote_name $tar_name
+ echo "Info: pushing tag \"$tag_name\" to remote \"$remote_name\":"
+ git push $remote_name $tag_name
if [ $? -ne 0 ]; then
- echo "Error: unable to push tag \"$tar_name\" to the remote repository."
+ echo "Error: unable to push tag \"$tag_name\" to the remote repository."
echo " it is recommended you fix this manually and not run the script again"
cd $top_src
return 1
fi
else
- echo "Info: skipped pushing tag \"$tar_name\" to the remote repository in dry-run mode."
+ echo "Info: skipped pushing tag \"$tag_name\" to the remote repository in dry-run mode."
fi
MD5SUM=`which md5sum || which gmd5sum`
@@ -636,7 +636,7 @@ process_module() {
# The top commit may not have been tagged in dry-run mode. Use commit.
tag_range=$tag_previous..$local_top_commit_sha
else
- tag_range=$tar_name
+ tag_range=$tag_name
fi
generate_announce > "$tar_name.announce"
echo "Info: [ANNOUNCE] template generated in \"$tar_name.announce\" file."