From: Jim Wise <jwise@draga.com>
Date: Wed, 8 Jun 2011 20:27:40 +0000 (-0400)
Subject: Tweak to work with SunOS /bin/sh.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=0e3fa65c2cd2aac4a4ed60a00f74bffa02e47107;p=sbcl.git

Tweak to work with SunOS /bin/sh.
---

diff --git a/generate-version.sh b/generate-version.sh
index 865827e..22ed0a4 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -2,10 +2,10 @@
 # Not a shell script, but something intended to be sourced from shell scripts
 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)
+    if `which git >/dev/null 2>/dev/null && git describe >/dev/null 2>/dev/null`
     then
         # Check that some of the newer git versions we use are supported.
-        if [ "0" != "$(git rev-list HEAD --not HEAD --count 2> /dev/null)" ]
+        if [ "0" != `git rev-list HEAD --not HEAD --count 2> /dev/null` ]
         then
             echo "Too old a git installation."
             echo
@@ -21,11 +21,11 @@ git_available_p() {
 }
 
 generate_version() {
-    if ([ -f version.lisp-expr ] && ! git_available_p)
+    if [ -f version.lisp-expr -a ! git_available_p ]
     then
         # Relase tarball, leave version.lisp-expr alone.
         return
-    elif ! git_available_p
+    elif [ ! git_available_p ]
     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