From 7c531c9dab7f31a3119ecfaf5106ae2435b80134 Mon Sep 17 00:00:00 2001
From: retropikzel <retropikzel@iki.fi>
Date: Sun, 22 Mar 2026 19:05:59 +0200
Subject: [PATCH] Move all to use the #|...|# form

---
 compile-r7rs | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/compile-r7rs b/compile-r7rs
index 2fbad04..ce278c0 100644
--- a/compile-r7rs
+++ b/compile-r7rs
@@ -80,28 +80,22 @@ case $rnrs in
             gambit) cmd="exec gsi -:r7rs $prepend_dirs $append_dirs \"\$0\" \"\$@\"";;
             goldfish) cmd="exec goldfish --mode r7rs \"\$0\" \"\$@\"";;
             guile) cmd="exec guile --r7rs $prepend_dirs $append_dirs \"\$0\" \"\$@\"";;
-            kawa) printf "\n#|\nexec kawa -J--enable-native-access=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED --r7rs --full-tailcalls -Dkawa.import.path=$prepend_dirs:$append_dirs:/usr/local/share/kawa/lib/*.sld -f \$0\n|#" > "$output_file";;
-            larceny) printf "\n#|\nexec larceny -r7rs -utf8 -quiet -nobanner $prepend_dirs $append_dirs -program \$0 --\n|#\n" > "$output_file";;
+            kawa) cmd="classpath=\$(kawa -e '(display (get-environment-variable \"CLASSPATH\"))')\nCLASSPATH=\${classpath%%kawa.jar} exec kawa -J--enable-native-access=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.layout=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign.abi=ALL-UNNAMED -J--add-exports=java.base/jdk.internal.foreign=ALL-UNNAMED --r7rs --full-tailcalls -Dkawa.import.path=$prepend_dirs:$append_dirs:\${classpath%%kawa.jar}/*.sld -f \"\$0\" \"\$@\"";;
+            larceny) cmd="exec larceny -r7rs -utf8 -quiet -nobanner $prepend_dirs $append_dirs -program \"\$0\" -- \"\$@\"";;
             loko) LOKO_LIBRARY_PATH="$prepend_dirs:$append_dirs" loko -std=r7rs --compile "$input_file";
                   if [ ! "${input_file%.scm}" = "$output_file" ]; then mv -f "${input_file%.sps}" "$output_file"; fi;;
-            meevax) echo "$prefix meevax $prepend_dirs $append_dirs" > "$output_file";;
-            mit-scheme) {
-                printf "\n#|\n"
-                echo 'libs=""'
-                echo "for dir in $prepend_dirs $append_dirs; do libs=\"\$libs \$(find \$dir -name *.sld -printf \"--load %p \")\"; done"
-                echo "exec mit-scheme --batch-mode \$libs --load \$0 --eval \"(exit 0)\" -- \"$@\""
-                echo "|#"
-                } > "$output_file";;
-            mosh) echo "$prefix MOSH_LOADPATH=$prepend_dirs:$append_dirs mosh" > "$output_file";;
-            racket) echo "$prefix racket -I r7rs $prepend_dirs $append_dirs --script" > "$output_file";;
-            sagittarius) echo "$prefix sash -r7 $prepend_dirs $append_dirs" > "$output_file";;
-            skint) printf "\n#|\nexec skint $prepend_dirs $append_dirs --program \$0 \n|#\n" > "$output_file";;
-            stklos) echo "$prefix stklos $prepend_dirs $append_dirs" > "$output_file";;
+            meevax) cmd="exec meevax $prepend_dirs $append_dirs \"\$0\" \"\$@\"";;
+            mit-scheme) cmd="libs=\nfor dir in $prepend_dirs $append_dirs; do libs=\"\$libs \$(find \$dir -name *.sld -printf \"--load %%p \")\"; done; exec mit-scheme --batch-mode \$libs --load \$0 --eval \"(exit 0)\" -- \"$@\"";;
+            mosh) cmd="MOSH_LOADPATH=$prepend_dirs:$append_dirs exec mosh \"\$0\" \"\$@\"";;
+            racket) cmd="exec racket -I r7rs $prepend_dirs $append_dirs --script \"\$0\" \"\$@\"";;
+            sagittarius) cmd="exec sash -r7 $prepend_dirs $append_dirs \"\$0\" \"\$@\"";;
+            skint) cmd="exec skint $prepend_dirs $append_dirs --program \"\$0\" \"\$@\"";;
+            stklos) cmd="exec stklos $prepend_dirs $append_dirs \"\$0\" \"\$@\"";;
             tr7) case "$prepend_dirs:$append_dirs" in
-                ":") echo "$prefix tr7i -1" > "$output_file";;
-                *) echo "$prefix TR7_LIB_PATH=$prepend_dirs:$append_dirs tr7i -1" > "$output_file";;
+                ":") cmd="exec tr7i -1 \"\$0\" \"\$@\"";;
+                *) cmd="TR7_LIB_PATH=$prepend_dirs:$append_dirs exec tr7i -1 \"\$0\" \"$@\"";;
             esac;;
-            ypsilon) echo "$prefix ypsilon $prepend_dirs $append_dirs --top-level-program" > "$output_file";;
+            ypsilon) cmd="exec ypsilon $prepend_dirs $append_dirs --top-level-program \"\$0\" \"\$@\"";;
             *) echo "Unsupported implementation RNRS combination: $COMPILE_R7RS $rnrs"; exit 1;;
         esac;;
 esac