From 2beb916c014eba4c42c32469ca1f4f7a0cd94d67 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 11 Mar 2012 00:30:25 -0800
Subject: [PATCH] Change get_fasl_file to set a variable rather than echo the
 name.

---
 src/etc/build-bands.sh           | 2 +-
 src/etc/build-boot-compiler.sh   | 3 +--
 src/etc/compile-boot-compiler.sh | 2 +-
 src/etc/compile-svm.sh           | 2 +-
 src/etc/compile.sh               | 2 +-
 src/etc/functions.sh             | 4 ++--
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index ce684bf3d..333c6f51d 100755
--- 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 059f66d9c..5b28a43fa 100755
--- 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 8976e8aac..9ecbc7e15 100755
--- 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 8700e00db..9f1e49af9 100755
--- 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 043e6a734..51d0e4942 100755
--- 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 eef2aa1bf..ce346a7e8 100644
--- 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
-- 
2.25.1