1
0
mirror of https://github.com/wting/autojump synced 2024-10-27 20:34:07 +00:00

avoid making the tag on the wrongly numbered autojump

This commit is contained in:
Joël Schaerer 2011-11-18 14:25:54 +01:00
parent 79f2b29de5
commit 2f4581665e
2 changed files with 16 additions and 6 deletions

View File

@ -7,8 +7,14 @@ then
exit exit
fi fi
gitrevision=`git describe` if [ -z "$1" ]
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then then
gitrevision=$gitrevision"-dirty" gitrevision=`git describe`
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
gitrevision=$gitrevision"-dirty"
fi
else
gitrevision="$1"
fi fi
sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump sed -i "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"$gitrevision\"/" autojump

View File

@ -8,9 +8,14 @@ then
exit 1 exit 1
fi fi
version=$1 version=$1
tagname=release-${version}
./git-version.sh ${tagname}
# Commit the version change
git commit autojump
#Create tag #Create tag
git tag -a release-${version} git tag -a ${tagname}
#check for tag existence #check for tag existence
git describe release-$1 2>&1 >/dev/null || git describe release-$1 2>&1 >/dev/null ||
@ -19,5 +24,4 @@ git describe release-$1 2>&1 >/dev/null ||
exit 1 exit 1
} }
./git-version.sh git archive --format=tar --prefix autojump_${version}/ ${tagname} | gzip > autojump_${version}.tar.gz
git archive --format=tar --prefix autojump_${version}/ release-${version} | gzip > autojump_${version}.tar.gz