The branch "master" has been updated in SBCL:
via 987e39e16c89c33f163f8f2d85cc28f67738d67d (commit)
from 9ae145dfb3ae4f6968a70700a7f72c8a6e16b815 (commit)
- Log -----------------------------------------------------------------
commit 987e39e16c89c33f163f8f2d85cc28f67738d67d
Author: Jim Wise <jwise@...>
Date: Mon Oct 24 09:38:25 2011 -0400
Fix HEAD ref lookups, and compatibility for non-bash shells.
---
generate-version.sh | 2 +-
make-config.sh | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/generate-version.sh b/generate-version.sh
index a01ae7d..7d2ef6f 100755
--- a/generate-version.sh
+++ b/generate-version.sh
@@ -26,7 +26,7 @@ generate_version() {
fi
# Build it.
version_head=`git rev-parse HEAD`
- if `cat .git/HEAD` | grep -q "ref: refs/heads/.*" > /dev/null 2>&1
+ if grep -q "ref: refs/heads/.*" .git/HEAD > /dev/null 2>&1
then
version_branchname=`cut -d / -f 3- < .git/HEAD`
else
diff --git a/make-config.sh b/make-config.sh
index 98564dd..3fb3fdb 100644
--- a/make-config.sh
+++ b/make-config.sh
@@ -191,10 +191,10 @@ generate_version
# dependencies, write them out to a file to be sourced by other
# scripts.
-echo "export DEVNULL=\"$DEVNULL\"" > output/build-config
-echo "export GNUMAKE=\"$GNUMAKE\"" >> output/build-config
-echo "export SBCL_XC_HOST=\"$SBCL_XC_HOST\"" >> output/build-config
-echo "export legacy_xc_spec=\"$legacy_xc_spec\"" >> output/build-config
+echo "DEVNULL=\"$DEVNULL\"; export DEVNULL" > output/build-config
+echo "GNUMAKE=\"$GNUMAKE\"; export GNUMAKE" >> output/build-config
+echo "SBCL_XC_HOST=\"$SBCL_XC_HOST\"; export SBCL_XC_HOST" >> output/build-config
+echo "legacy_xc_spec=\"$legacy_xc_spec\"; export legacy_xc_spec" >> output/build-config
# And now, sorting out the per-target dependencies...
-----------------------------------------------------------------------
hooks/post-receive
--
SBCL
|