diff options
| author |  David Adam (zanchey) <zanchey@ucc.gu.uwa.edu.au> | 2013-09-02 20:08:46 +0800 |
|---|---|---|
| committer | David Adam (zanchey) <zanchey@ucc.gu.uwa.edu.au> | 2013-09-02 20:08:46 +0800 |
| commit | 8159f55243e79f7107c09047e7d6b9e36f6ababf (patch) | |
| tree | 64e0936d508e05086a8153bd24d4cb8dc891be4e /build_tools | |
| parent | cca60adc35c228178421c386b12d737048246877 (diff) | |
git version generation fixes
- Remove the `version` file created for the tarball after the tarball is finished
- Use the builtin type instead of which.
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/git_version_gen.sh | 2 | ||||
| -rwxr-xr-x | build_tools/make_tarball.sh | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/build_tools/git_version_gen.sh b/build_tools/git_version_gen.sh index 5a54eb3b..3ffd0eb2 100755 --- a/build_tools/git_version_gen.sh +++ b/build_tools/git_version_gen.sh @@ -12,7 +12,7 @@ DEF_VER=2.0.GIT if test -f version then VN=$(cat version) || VN="$DEF_VER" -elif test -d .git -o -f .git && which git >/dev/null +elif test -d .git -o -f .git && type git >/dev/null then VN=$(git describe --tags --dirty 2>/dev/null) else diff --git a/build_tools/make_tarball.sh b/build_tools/make_tarball.sh index 77d78c67..54398b13 100755 --- a/build_tools/make_tarball.sh +++ b/build_tools/make_tarball.sh @@ -42,6 +42,7 @@ ln -s "$wd" "$prefix" gnutar --append --file="$path" "$prefix"/user_doc/html gnutar --append --file="$path" "$prefix"/share/man gnutar --append --file="$path" "$prefix"/version +rm -f "$prefix"/version rm -f "$prefix" # gzip it |