X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=run-sbcl.sh;h=3788bd9798bb9fc6a42ca7fc642f5c7b38915bb8;hb=04b902c7279d7f9e5fa75bccca2e26a002544eca;hp=d14b202778d93878a2585aaa17793ecbd787e209;hpb=f86c1ec4e8782fd24c758c9775c8592a16768215;p=sbcl.git

diff --git a/run-sbcl.sh b/run-sbcl.sh
old mode 100644
new mode 100755
index d14b202..3788bd9
--- a/run-sbcl.sh
+++ b/run-sbcl.sh
@@ -13,22 +13,49 @@
 
 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
+this="$0"
+
+# OSX 10.8 readlink doesn't have -f
+while [ -h "$this" ]; do
+    # [ -h should guarantee that readlink output will be non-null
+    link=`readlink -n "$this"`
+    # if absolute path
+    if expr "$link" : '^/.*' > /dev/null; then
+        this="$link"
+    else
+        this=`dirname "$this"`/"$link"
+    fi
+done
+BASE=`dirname "$this"`
+
+CORE_DEFINED=no
 
-BASE=`dirname "$0"`
+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: $BASE)" 1>&2
+    SBCL_HOME="$BASE/obj/sbcl-home" "$BASE"/src/runtime/sbcl $ARGUMENTS "$@"
 else
     echo "No built SBCL here ($BASE): run 'sh make.sh' first!"
     exit 1