Change get_fasl_file to set a variable rather than echo the name.

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index ce684bf3d6498fcc88fe870f48d4cca937b336e5..333c6f51daea3c5d82d6a2fe2d238fba6bc509a7 100755 (executable)
--- a/src/etc/build-bands.sh
+++ b/src/etc/build-bands.sh
@@ -27,7 +27,7 @@ set -e
 . etc/functions.sh
 
 if [ ! -e lib/runtime.com ]; then
-  FASL=`get_fasl_file`
+  get_fasl_file
   run_cmd_in_dir runtime \
        ../microcode/scheme --batch-mode --library ../lib --fasl $FASL <<EOF
 (disk-save "../lib/runtime.com")

diff --git a/src/etc/build-boot-compiler.sh b/src/etc/build-boot-compiler.sh
index 059f66d9cb0a7e832ba45918152c48f99862fd92..5b28a43faedaad15a2a47660f2166a558fb16d13 100755 (executable)
--- a/src/etc/build-boot-compiler.sh
+++ b/src/etc/build-boot-compiler.sh
@@ -26,8 +26,7 @@ set -e
 
 . etc/functions.sh
 
-FASL=`get_fasl_file`
-
+get_fasl_file
 run_cmd_in_dir runtime ../microcode/scheme --library ../lib \
     --fasl "${FASL}" --heap 6000 --batch-mode <<EOF
 (begin

diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 8976e8aac6a7f02076fe4a3189966cb371415baf..9ecbc7e15e774c0353dd9485bccc777fa8065873 100755 (executable)
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -40,7 +40,7 @@ run_cmd "${EXE}" --batch-mode <<EOF
   (for-each compile-dir '("runtime" "star-parser" "sf")))
 EOF
 
-FASL=`get_fasl_file`
+get_fasl_file
 run_cmd_in_dir runtime "${EXE}" --batch-mode --library ../lib --fasl $FASL <<EOF
 (disk-save "../lib/x-runtime.com")
 EOF

diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index 8700e00db82bb7b0a354fb78ca6976ad827cb188..9f1e49af9bc5216b74d9d8493d32723c63bfd0d6 100755 (executable)
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -53,7 +53,7 @@ done
 run_cmd_in_dir star-parser "${@}" --batch-mode --load compile.scm </dev/null
 
 echo "# `date`:    Dump new runtime into x-runtime.com."
-FASL=`get_fasl_file`
+get_fasl_file
 run_cmd_in_dir runtime \
     "${@}" --batch-mode --library ../lib --fasl $FASL <<EOF
 (disk-save "../lib/x-runtime.com")

diff --git a/src/etc/compile.sh b/src/etc/compile.sh
index 043e6a7343fb98052fe101ef8893541283f57093..51d0e49426f4cb54889fb64f4075a6fc138592b5 100755 (executable)
--- a/src/etc/compile.sh
+++ b/src/etc/compile.sh
@@ -33,7 +33,7 @@ run_cmd "${@}"<<EOF
   (for-each compile-dir '("runtime" "star-parser" "sf")))
 EOF
 
-FASL=`get_fasl_file`
+get_fasl_file
 run_cmd_in_dir runtime ../microcode/scheme --batch-mode                \
        --library ../lib --fasl $FASL <<EOF
 (disk-save "../lib/runtime.com")

diff --git a/src/etc/functions.sh b/src/etc/functions.sh
index eef2aa1bf95b5872744b1049c2078ded4875b727..ce346a7e8addd94f1fd7321cf54c8cd814582b09 100644 (file)
--- a/src/etc/functions.sh
+++ b/src/etc/functions.sh
@@ -52,10 +52,10 @@ run_cmd_in_dir ()
 get_fasl_file ()
 {
     if [ -f runtime/make.o ]; then
-       echo "http://www.gnu.org/software/mit-scheme/lib/runtime/make.so"
+       FASL=http://www.gnu.org/software/mit-scheme/lib/runtime/make.so
        return 0
     elif [ -f runtime/make.com ]; then
-       echo "make.com"
+       FASL=make.com
        return 0
     else
        echo "Can't find argument for --fasl." >&2