From a71685c7919fe78b5861bfab76a7dea384ab5f61 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Sun, 11 Mar 2012 00:43:48 -0800
Subject: [PATCH] Fix shell-script style issues.

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

diff --git a/src/etc/build-bands.sh b/src/etc/build-bands.sh
index 333c6f51d..98a4b8029 100755
--- a/src/etc/build-bands.sh
+++ b/src/etc/build-bands.sh
@@ -29,7 +29,7 @@ set -e
 if [ ! -e lib/runtime.com ]; then
   get_fasl_file
   run_cmd_in_dir runtime \
-	../microcode/scheme --batch-mode --library ../lib --fasl $FASL <<EOF
+	../microcode/scheme --batch-mode --library ../lib --fasl "${FASL}" <<EOF
 (disk-save "../lib/runtime.com")
 EOF
 fi
diff --git a/src/etc/compile-boot-compiler.sh b/src/etc/compile-boot-compiler.sh
index 9ecbc7e15..25e5f4e3d 100755
--- a/src/etc/compile-boot-compiler.sh
+++ b/src/etc/compile-boot-compiler.sh
@@ -41,7 +41,8 @@ run_cmd "${EXE}" --batch-mode <<EOF
 EOF
 
 get_fasl_file
-run_cmd_in_dir runtime "${EXE}" --batch-mode --library ../lib --fasl $FASL <<EOF
+run_cmd_in_dir runtime "${EXE}" --batch-mode --library ../lib \
+    --fasl "${FASL}" <<EOF
 (disk-save "../lib/x-runtime.com")
 EOF
 echo ""
diff --git a/src/etc/compile-svm.sh b/src/etc/compile-svm.sh
index 9f1e49af9..36b187745 100755
--- a/src/etc/compile-svm.sh
+++ b/src/etc/compile-svm.sh
@@ -43,19 +43,19 @@ echo "# `date`: Re-compile the cross-compiler."
 
 echo "# `date`:    Re-syntax prerequisites."
 for DIR in runtime sf cref; do
-    run_cmd_in_dir $DIR "${@}" --batch-mode --load $DIR.sf </dev/null
+    run_cmd_in_dir ${DIR} "${@}" --batch-mode --load ${DIR}.sf </dev/null
 done
 
 echo "# `date`:    Re-compile prerequisites."
 for DIR in runtime sf cref; do
-    run_cmd_in_dir $DIR "${@}" --batch-mode --load $DIR.cbf </dev/null
+    run_cmd_in_dir ${DIR} "${@}" --batch-mode --load ${DIR}.cbf </dev/null
 done
 run_cmd_in_dir star-parser "${@}" --batch-mode --load compile.scm </dev/null
 
 echo "# `date`:    Dump new runtime into x-runtime.com."
 get_fasl_file
 run_cmd_in_dir runtime \
-    "${@}" --batch-mode --library ../lib --fasl $FASL <<EOF
+    "${@}" --batch-mode --library ../lib --fasl "${FASL}" <<EOF
 (disk-save "../lib/x-runtime.com")
 EOF
 echo ""
@@ -94,7 +94,7 @@ echo "# `date`: Restore previously cross-compiled code."
 # rebuilt cross-compiler.)
 run_cmd ./Stage.sh unmake 0
 
-if [ "$FAST" ]; then
+if [ "${FAST}" ]; then
 
     # Use the host-compiled cross-compiler to compile everything.  If
     # the host system is native, this will be much faster than using the
@@ -108,7 +108,7 @@ if [ "$FAST" ]; then
 
     echo "# `date`: Re-cross-compile everything."
     run_cmd "${@}" --batch-mode --library lib \
-		   --band x-compiler.com --heap $HEAP <<EOF
+		   --band x-compiler.com --heap ${HEAP} <<EOF
 (begin
   (load "etc/compile")
   (fluid-let ((compiler:generate-lap-files? #t)
@@ -141,7 +141,7 @@ HEAP=9000
 
 echo "# `date`: Re-cross-compile boot-dirs."
 run_cmd "${@}" --batch-mode --library lib \
-    --band x-compiler.com --heap $HEAP <<EOF
+    --band x-compiler.com --heap ${HEAP} <<EOF
 (begin
   (load "etc/compile")
   (fluid-let ((compiler:generate-lap-files? #f)
@@ -160,7 +160,7 @@ EOF
 
 echo "# `date`: Dump new compiler into boot-compiler.com."
 run_cmd_in_dir runtime \
-    ../microcode/scheme --batch-mode --library ../lib --fasl $FASL <<EOF
+    ../microcode/scheme --batch-mode --library ../lib --fasl "${FASL}" <<EOF
 (begin
   (disk-save "../lib/boot-runtime.com")
   (load-option 'SF)
@@ -174,7 +174,7 @@ run_cmd ./Stage.sh make-cross 0
 
 echo "# `date`: Use the new machine and compiler to re-compile everything."
 run_cmd ./microcode/scheme --batch-mode --library lib \
-    --band boot-compiler.com --heap $HEAP <<EOF
+    --band boot-compiler.com --heap ${HEAP} <<EOF
 (begin
   (load "etc/compile")
   (fluid-let ((compiler:generate-lap-files? #f)
diff --git a/src/etc/compile.sh b/src/etc/compile.sh
index 51d0e4942..2056b609b 100755
--- a/src/etc/compile.sh
+++ b/src/etc/compile.sh
@@ -26,7 +26,7 @@ set -e
 
 . etc/functions.sh
 
-run_cmd "${@}"<<EOF
+run_cmd "${@}" <<EOF
 (begin
   (load "etc/compile.scm")
   (compile-cref compile-dir)
@@ -35,7 +35,7 @@ EOF
 
 get_fasl_file
 run_cmd_in_dir runtime ../microcode/scheme --batch-mode		\
-	--library ../lib --fasl $FASL <<EOF
+	--library ../lib --fasl "${FASL}" <<EOF
 (disk-save "../lib/runtime.com")
 EOF
 
@@ -47,7 +47,7 @@ run_cmd ./microcode/scheme --batch-mode --library lib --band runtime.com <<EOF
     (lambda () (load "compiler.sf"))))
 EOF
 
-run_cmd "${@}"<<EOF
+run_cmd "${@}" <<EOF
 (with-working-directory-pathname "compiler/"
   (lambda () (load "compiler.cbf")))
 EOF
-- 
2.25.1