nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix git version script

Browse source
This commit is contained in:
o9000 2015-04-25 00:07:25 +02:00
parent 0e322b3563
commit 00930b217d
2 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
get_version.sh
View file

@ -4,17 +4,27 @@ git update-index -q --ignore-submodules --refresh
# Disallow unstaged changes in the working tree # Disallow unstaged changes in the working tree
if ! git diff-files --quiet --ignore-submodules -- if ! git diff-files --quiet --ignore-submodules --
then then
echo >&2 "Error: there are unstaged changes." if [ "$1" = "--strict" ]
git diff-files --name-status -r --ignore-submodules -- >&2 then
exit 1 echo >&2 "Error: there are unstaged changes."
git diff-files --name-status -r --ignore-submodules -- >&2
exit 1
else
echo "dirty"
fi
fi fi
# Disallow uncommitted changes in the index # Disallow uncommitted changes in the index
if ! git diff-index --cached --quiet HEAD --ignore-submodules -- if ! git diff-index --cached --quiet HEAD --ignore-submodules --
then then
echo >&2 "Error: there are uncommitted changes." if [ "$1" = "--strict" ]
git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2 then
exit 1 echo >&2 "Error: there are uncommitted changes."
git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2
exit 1
else
echo "dirty"
fi
fi fi
git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')" git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')"

2
make_release.sh
View file

@ -19,7 +19,7 @@
# #
# git checkout master # git checkout master
VERSION=$(./get_version.sh) VERSION=$(./get_version.sh --strict)
if [ ! $? -eq 0 ] if [ ! $? -eq 0 ]
then then
echo >&2 "Error: get_version.sh failed!" echo >&2 "Error: get_version.sh failed!"