Simplify the run scripts

Makefile

@@ -168,7 +168,7 @@ get_run_prefix = $(strip $(foreach mode,$(call actual_impl,$(1))_MODE, \
 
 # Takes impl and step
 # Returns the runtest command prefix (with runtest options) for testing the given step
-get_runtest_cmd = $(call get_run_prefix,$(1),$(2),$(if $(filter cs fsharp mal tcl vb,$(1)),RAW=1,)) \
+get_runtest_cmd = $(call get_run_prefix,$(1),$(2),$(if $(filter cs fsharp mal perl tcl vb,$(1)),RAW=1)) \
 		    ../../runtest.py $(opt_HARD) $(opt_DEFERRABLE) $(opt_OPTIONAL) $(call $(1)_TEST_OPTS) $(TEST_OPTS)
 
 # Takes impl and step

impls/ada.2/run

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/ada/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/awk/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec awk -O -f $(dirname $0)/${STEP:-stepA_mal}.awk "${@}"
+#!/bin/sh
+set -Cefu
+exec awk -f ${STEP:-stepA_mal}.awk "$@"

impls/bash/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec bash $(dirname $0)/${STEP:-stepA_mal}.sh "${@}"
+#!/bin/sh
+set -Cefu
+exec bash ${STEP:-stepA_mal}.sh "$@"

impls/bash/step0_repl.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 READ () {
     read -u 0 -e -p "user> " r
 }

impls/bash/step1_read_print.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 

impls/bash/step2_eval.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 

impls/bash/step3_env.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step4_if_fn_do.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step5_tco.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step6_file.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step7_quote.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step8_macros.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/step9_try.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/bash/stepA_mal.sh

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 source $(dirname $0)/reader.sh
 source $(dirname $0)/printer.sh
 source $(dirname $0)/env.sh

impls/basic/run

@@ -1,8 +1,12 @@
-#!/usr/bin/env bash
-cd $(dirname $0)
-(echo "(def! -*ARGS*- (list $(for a in "${@}"; do echo -n " \"${a}\""; done)))") > .args.mal
+#!/bin/sh
+set -efu
+{
+    printf '(def! -*ARGS*- (list'
+    [ $# = 0 ] || printf ' "%s"' "$@"
+    echo '))'
+} > .args.mal
 case ${basic_MODE:-cbm} in
-    cbm)    exec cbmbasic ${STEP:-stepA_mal}.bas "${@}" ;;
-    qbasic) exec ./${STEP:-stepA_mal} "${@}" ;;
-    *)      echo "Invalid basic_MODE: ${basic_MODE}"; exit 2 ;;
+    cbm)    exec cbmbasic ${STEP:-stepA_mal}.bas "$@" ;;
+    qbasic) exec ./${STEP:-stepA_mal} "$@" ;;
+    *)      echo "Invalid basic_MODE: $basic_MODE"; exit 2 ;;
 esac

impls/bbc-basic/run

@@ -1,3 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -Cefu
 exec "${BRANDY:-sbrandy}" -size 1024k \
-    -path ../bbc-basic -quit $(dirname $0)/${STEP:-stepA_mal}.bas "${@}"
+    -quit ${STEP:-stepA_mal}.bas "$@"

impls/c.2/run

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/c/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/chuck/run

@@ -1,11 +1,21 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -Ceu
+step=${STEP:-stepA_mal}.ck
+
 regex_chugin=${REGEX_CHUGIN:-/usr/local/lib/chuck/1.5.2.5/RegEx.chug}
-if [[ ! -f "$regex_chugin" ]]; then
-    echo "Set \$REGEX_CHUGIN to the absolute path of RegEx.chug"; exit 1
+if [ ! -f "$regex_chugin" ]; then
+    echo 'Set $REGEX_CHUGIN to the absolute path of RegEx.chug'
+    exit 1
 fi
 
-imports=$(grep "^ *// *@import" "$(dirname $0)/${STEP:-stepA_mal}.ck" | awk '{print $3}')
-imports=$(for i in ${imports}; do ls $(dirname $0)/${i}; done)
-old_IFS="${IFS}"; IFS=$'\a'; export CHUCK_ARGS="${*}"; IFS="${old_IFS}"
+# The globs will be expanded in the exec line.
+imports=$(sed -n "s|^ *// *@import *||p" $step)
+
+separator=$(printf '\a')
+for x; do
+    CHUCK_ARGS="${CHUCK_ARGS:+$CHUCK_ARGS$separator}$x"
+done
+export CHUCK_ARGS
 
-exec chuck --caution-to-the-wind --silent --chugin:"$regex_chugin" ${imports} $(dirname $-1)/${STEP:-stepA_mal}.ck
+exec chuck --caution-to-the-wind --silent --chugin:"$regex_chugin" \
+     $imports $step

impls/clojure/run

@@ -1,8 +1,10 @@
-#!/usr/bin/env bash
-export PATH=$PATH:$(dirname $0)/node_modules/.bin
+#!/bin/sh
+set -Cefu
+export PATH="$PATH:node_modules/.bin"
 STEP=${STEP:-stepA_mal}
-if [ "${clojure_MODE}" = "cljs" ]; then
-  exec lumo -c $(dirname $0)/src -m mal.${STEP//_/-} "${@}"
-else
-  exec java -jar $(dirname $0)/target/${STEP}.jar "${@}"
-fi
+case ${clojure_MODE:-clj} in
+    cljs) exec lumo -c src -m mal.$(echo $STEP | tr _ -) "$@" ;;
+    clj)  exec java -jar target/$STEP.jar "$@" ;;
+esac
+echo "Invalid clojure_MODE: $clojure_MODE"
+exit 1

impls/coffee/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec coffee $(dirname $0)/${STEP:-stepA_mal}.coffee "${@}"
+#!/bin/sh
+set -Cefu
+exec coffee ${STEP:-stepA_mal}.coffee "$@"

impls/common-lisp/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/cpp/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/crystal/run

@@ -1,2 +1,3 @@
 #!/bin/sh
-exec $(dirname $0)/bin/${STEP:-stepA_mal} "${@}"
+set -Cefu
+exec bin/${STEP:-stepA_mal} "$@"

impls/crystal/step0_repl.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 
 # Note:

impls/crystal/step1_read_print.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step2_eval.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step3_env.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step4_if_fn_do.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step5_tco.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step6_file.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step7_quote.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step8_macros.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/step9_try.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "readline"
 require "./reader"
 require "./printer"

impls/crystal/stepA_mal.cr

@@ -1,5 +1,3 @@
-#! /usr/bin/env crystal run
-
 require "colorize"
 
 require "readline"

impls/cs/Makefile

@@ -24,13 +24,13 @@ all: $(patsubst %.cs,%.exe,$(SRCS))
 
 dist: mal.exe mal
 
-mal.exe: $(patsubst %.cs,%.exe,$(word $(words $(SOURCES)),$(SOURCES)))
+mal.exe: $(patsubst %.cs,%.exe,$(lastword $(SOURCES)))
 	cp $< $@
 
 # NOTE/WARNING: static linking triggers mono libraries LGPL
 # distribution requirements.
 # http://www.mono-project.com/archived/guiderunning_mono_applications/
-mal: $(patsubst %.cs,%.exe,$(word $(words $(SOURCES)),$(SOURCES))) mal.dll
+mal: $(patsubst %.cs,%.exe,$(lastword $(SOURCES))) mal.dll
 	mkbundle --static -o $@ $+ --deps
 
 mal.dll: $(LIB_SRCS)

impls/cs/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec mono $(dirname $0)/${STEP:-stepA_mal}.exe ${RAW:+--raw} "${@}"
+#!/bin/sh
+set -Cefu
+exec mono ${STEP:-stepA_mal}.exe ${RAW:+--raw} "$@"

impls/d/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/dart/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec dart --checked $(dirname $0)/${STEP:-stepA_mal}.dart "${@}"
+#!/bin/sh
+set -Cefu
+exec dart --checked ${STEP:-stepA_mal}.dart "$@"

impls/elisp/run

@@ -1,3 +1,5 @@
 #!/bin/sh
-dir=$(dirname $0)
-exec emacs -Q --batch -L $dir --eval "(setq text-quoting-style 'straight)" --load $dir/${STEP:-stepA_mal}.elc "${@}"
+set -Cefu
+exec emacs -Q --batch -L . \
+     --eval "(setq text-quoting-style 'straight)" \
+     --load ${STEP:-stepA_mal}.elc "$@"

impls/elixir/run

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
-cd $(dirname $0)
-exec mix ${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec mix ${STEP:-stepA_mal} "$@"

impls/elm/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec node $(dirname $0)/bootstrap.js ${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec node bootstrap.js ${STEP:-stepA_mal} "$@"

impls/erlang/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/es6/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec node $(dirname $0)/${STEP:-stepA_mal}.mjs "${@}"
+#!/bin/sh
+set -Cefu
+exec node ${STEP:-stepA_mal}.mjs "$@"

impls/factor/run

@@ -1,2 +1,4 @@
-#!/usr/bin/env bash
-exec factor $(dirname $0)/${STEP:-stepA_mal}/${STEP:-stepA_mal}.factor "${@}"
+#!/bin/sh
+set -Cefu
+step=${STEP:-stepA_mal}
+exec factor $step/$step.factor "$@"

impls/fantom/run

@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -Cefu
 export FAN_ENV=util::PathEnv
-export FAN_ENV_PATH="$(dirname $0)"
+export FAN_ENV_PATH=.
 exec fan ${STEP:-stepA_mal} "$@"

impls/fennel/run

@@ -1,3 +1,3 @@
-#!/usr/bin/env bash
-
-exec fennel $(dirname $0)/${STEP:-stepA_mal}.fnl "${@}"
+#!/bin/sh
+set -Cefu
+exec fennel ${STEP:-stepA_mal}.fnl "$@"

impls/forth/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec gforth $(dirname $0)/${STEP:-stepA_mal}.fs "${@}"
+#!/bin/sh
+set -Cefu
+exec gforth ${STEP:-stepA_mal}.fs "$@"

impls/fsharp/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec mono $(dirname $0)/${STEP:-stepA_mal}.exe ${RAW:+--raw} "${@}"
+#!/bin/sh
+set -Cefu
+exec mono ${STEP:-stepA_mal}.exe ${RAW:+--raw} "$@"

impls/gnu-smalltalk/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec gst -f $(dirname $0)/${STEP:-stepA_mal}.st "${@}"
+#!/bin/sh
+set -Cefu
+exec gst -f ${STEP:-stepA_mal}.st "$@"

impls/go/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec $(dirname $0)/${STEP:-stepA_mal} "${@}"
+#!/bin/sh
+set -Cefu
+exec ./${STEP:-stepA_mal} "$@"

impls/groovy/run

@@ -1,2 +1,3 @@
-#!/usr/bin/env bash
-exec groovy $(dirname $0)/${STEP:-stepA_mal}.groovy "${@}"
+#!/bin/sh
+set -Cefu
+exec groovy ${STEP:-stepA_mal}.groovy "$@"

impls/guile/run

@@ -1,3 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
+set -Cefu
 # XDG_CACHE_HOME is where guile stores the compiled files
-XDG_CACHE_HOME=.cache/ exec guile -L $(dirname $0) $(dirname $0)/${STEP:-stepA_mal}.scm "${@}"
+XDG_CACHE_HOME=.cache/ exec guile -L . ${STEP:-stepA_mal}.scm "$@"