[Sbcl-commits] CVS: sbcl run-sbcl.sh, 1.8, 1.9 version.lisp-expr, 1.4978, 1.4979

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17873

Modified Files:
	run-sbcl.sh version.lisp-expr 
Log Message:
1.0.42.7: fix shell scripts on Solaris (and FreeBSD?)

 * Patch by Josh Elsasser, lp#615497.

 * Fixes for run-sbcl.sh and tests/subr.sh on Solaris, some of which I
   believe were also necessary on FreeBSD.

 * A missing #include needed on Solaris is also added.


Index: run-sbcl.sh
===================================================================
RCS file: /cvsroot/sbcl/sbcl/run-sbcl.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- run-sbcl.sh	17 Aug 2010 11:35:24 -0000	1.8
+++ run-sbcl.sh	31 Aug 2010 12:46:41 -0000	1.9
@@ -14,15 +14,22 @@
 set -e
 
 BASE=`dirname "$0"`
-BASE=`(readlink -f ${BASE} 2> /dev/null || echo ${BASE})`
+if (readlink -f "${BASE}") >/dev/null 2>&1; then
+    BASE=`readlink -f ${BASE}`
+else
+    opwd=`pwd`
+    cd "${BASE}"
+    BASE=`pwd`
+    cd "${opwd}"
+fi
 CORE_DEFINED=no
 
 for arg in $*; do
     case $arg in
-        (--core)
+        --core)
           CORE_DEFINED=yes
           ;;
-        (--help)
+        --help)
           echo "usage: run-sbcl.sh sbcl-options*"
           echo
           echo "Runs SBCL from the build directory or binary tarball without need for"

Index: version.lisp-expr
===================================================================
RCS file: /cvsroot/sbcl/sbcl/version.lisp-expr,v
retrieving revision 1.4978
retrieving revision 1.4979
diff -u -d -r1.4978 -r1.4979
--- version.lisp-expr	31 Aug 2010 12:26:44 -0000	1.4978
+++ version.lisp-expr	31 Aug 2010 12:46:41 -0000	1.4979
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.42.6"
+"1.0.42.7"