mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-22 20:16:12 +08:00
git version generation fixes
- Remove the `version` file created for the tarball after the tarball is finished - Use the builtin type instead of which.
This commit is contained in:
parent
cca60adc35
commit
8159f55243
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue
Block a user