projects
/
sbcl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26cad2d
)
Fix generate_version.sh for release tarballs
author
Juho Snellman
<jsnell@iki.fi>
Mon, 11 Jul 2011 21:51:33 +0000
(23:51 +0200)
committer
Juho Snellman
<jsnell@iki.fi>
Mon, 11 Jul 2011 22:05:01 +0000
(
00:05
+0200)
generate-version.sh
patch
|
blob
|
history
diff --git
a/generate-version.sh
b/generate-version.sh
index
c2c4b63
..
b538611
100755
(executable)
--- a/
generate-version.sh
+++ b/
generate-version.sh
@@
-4,18
+4,19
@@
git_available_p() {
# Check that (1) we have git (2) this is a git tree.
if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
then
# Check that (1) we have git (2) this is a git tree.
if ( which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null )
then
- true
+ echo "ok"
else
else
- false
+ echo ""
fi
}
generate_version() {
fi
}
generate_version() {
- if [ -f version.lisp-expr -a ! git_available_p ]
+ AVAILABLE=$(git_available_p)
+ if [ -f version.lisp-expr -a -z "$AVAILABLE" ]
then
# Relase tarball, leave version.lisp-expr alone.
return
then
# Relase tarball, leave version.lisp-expr alone.
return
- elif [ ! git_available_p ]
+ elif [ -z "$AVAILABLE" ]
then
echo "Can't run 'git describe' and version.lisp-expr is missing." >&2
echo "To fix this, either install git or create a fake version.lisp-expr file." >&2
then
echo "Can't run 'git describe' and version.lisp-expr is missing." >&2
echo "To fix this, either install git or create a fake version.lisp-expr file." >&2