From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Tue, 15 Sep 2009 20:23:40 +0000 (+0000)
Subject: 1.0.31.10: run-sbcl.sh to support --core
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=bfd759c5fbfba4e1799cf4d06de0a0f349f06abd;p=sbcl.git

1.0.31.10: run-sbcl.sh to support --core

 Thanks to Attila Lendvai.
---

diff --git a/run-sbcl.sh b/run-sbcl.sh
index d14b202..74b91cb 100644
--- a/run-sbcl.sh
+++ b/run-sbcl.sh
@@ -13,22 +13,35 @@
 
 set -e
 
-if [ "$1" = "--help" ]; then
-    echo "usage: run-sbcl.sh sbcl-options*"
-    echo
-    echo "Runs SBCL from the build directory or binary tarball without need for"
-    echo "installation. Except for --help and --core, accepts all the same"
-    echo "command-line options as SBCL does."
-    echo
-    exit 1
-fi
-
 BASE=`dirname "$0"`
+CORE_DEFINED=no
+
+for arg in $*; do
+    case $arg in
+        (--core)
+          CORE_DEFINED=yes
+          ;;
+        (--help)
+          echo "usage: run-sbcl.sh sbcl-options*"
+          echo
+          echo "Runs SBCL from the build directory or binary tarball without need for"
+          echo "installation. Except for --help, accepts all the same command-line options"
+          echo "as SBCL does."
+          echo
+          exit 1
+          ;;
+    esac
+done
+
+ARGUMENTS=""
+
+if [ "$CORE_DEFINED" = "no" ]; then
+    ARGUMENTS="--core "$BASE"/output/sbcl.core"
+fi
 
 if [ -x "$BASE"/src/runtime/sbcl -a -f "$BASE"/output/sbcl.core ]; then
-    echo "(running SBCL from: $BASE)"
-    SBCL_HOME="$BASE"/contrib \
-        "$BASE"/src/runtime/sbcl --core "$BASE"/output/sbcl.core "$@"
+    echo "(running SBCL from: `pwd`)"
+    SBCL_HOME="$BASE"/contrib "$BASE"/src/runtime/sbcl $ARGUMENTS "$@"
 else
     echo "No built SBCL here ($BASE): run 'sh make.sh' first!"
     exit 1
diff --git a/version.lisp-expr b/version.lisp-expr
index 849163d..a6e43bc 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -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.31.9"
+"1.0.31.10"