Paulus/fix spaces2

.gitignore

@@ -1,2 +1,3 @@
 dependency-reduced-pom.xml
 target
+out

demo/src/foo/core.clj

@@ -0,0 +1,4 @@
+(ns foo.core)
+
+(defn -main [& args]
+  (prn args))

pom.xml

@@ -25,7 +25,7 @@
 
   <properties>
     <clojure.version>1.9.0</clojure.version>
-    <tools.deps.version>0.5.460</tools.deps.version>
+    <tools.deps.version>0.5.461-SNAPSHOT</tools.deps.version>
   </properties>
 
   <dependencies>

script/demo

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+set -euo pipefail && cd "$(dirname "${BASH_SOURCE[0]}")/.."
+
+bash -x out/inst/bin/clojure -Srepro -Sdeps '{:paths ["demo/src"] :aliases {:space {:main-opts ["-m" "foo.core" "-co" "{:aot-cache true}"]}}}' -Aspace

script/explode

@@ -0,0 +1,107 @@
+#!/usr/bin/env bash
+set -euo pipefail && cd "$(dirname "${BASH_SOURCE[0]}")/.."
+
+# Explodes the first argument passed, string, into an array
+#
+# Arguments are separated by newlines. A literal newline must be escaped with a
+# backslash. A backslah needs to be escaped as \\. A single trailing newline
+# will be ignored. Results are written to global array `args'.
+
+function explode() {
+    s="$1"
+
+    # Remove trailing newline
+
+    if [[ "${s:$((${#s}-1)):1}" == $'\n' ]]; then
+        s=${s:0:${#s}-1}
+    fi
+
+    args=()
+
+    if [[ "$s" != "" ]]; then
+        arg=""
+
+        for (( i=0; i<${#s}; i++ )); do
+            c="${s:$i:1}"
+
+            if [[ "$c" == $'\n' ]]; then
+                args+=("$arg")
+                arg=""
+            elif [[ "$c" == "\\" ]]; then
+                # Interpret next character literally
+                i=$((i + 1))
+                c="${s:$i:1}"
+                arg="${arg}${c}"
+            else
+                arg="${arg}${c}"
+            fi
+        done
+
+        args+=("$arg")
+    fi
+}
+
+# ---------------
+# Unit tests
+
+function dump() {
+    python -c "import sys, json; sys.stdout.write(json.dumps(sys.argv[1:]))" "$@"
+}
+
+function check() {
+    if [[ "${args[@]+"${args[@]}"}" == "" ]]; then
+        # Corner case, Bash array oddity
+        actual="[]"
+    else
+        # Normal casek
+        actual="$(dump "${args[@]+"${args[@]}"}")"
+    fi
+    if [[ "$actual" != "$expected" ]]; then
+        echo "Assertion failed"
+        printf "actual:   %s\n" "$actual"
+        printf "expected: %s\n" "$expected"
+        exit 1
+    else
+        echo "Ok"
+    fi
+}
+
+explode $'foo bar'
+expected='["foo bar"]'
+check
+
+explode $'foo\nbar'
+expected='["foo", "bar"]'
+check
+
+explode $'foo\nbar\n'
+expected='["foo", "bar"]'
+check
+
+explode $'foo\nbar '
+expected='["foo", "bar "]'
+check
+
+explode $'-co\n{:aot-cache true}'
+expected='["-co", "{:aot-cache true}"]'
+check
+
+explode $''
+expected='[]'
+check
+
+explode $'\nfoo'
+expected='["", "foo"]'
+check
+
+explode $'\nfoo\n\nbar'
+expected='["", "foo", "", "bar"]'
+check
+
+explode $'foo\\\nbar'
+expected='["foo\nbar"]'
+check
+
+explode $'foo\\'
+expected='["foo"]'
+check

script/try

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+set -euo pipefail && cd "$(dirname "${BASH_SOURCE[0]}")/.."
+
+set -x
+
+pushd ../tools.deps.alpha
+mvn install
+popd
+
+script/package.sh
+rm -rf out
+mkdir -p out
+tar xfzv target/*.tar.gz -C out
+mkdir -p out/inst
+cd out/clojure-tools
+./install.sh "$(realpath ../inst)"

src/main/resources/clojure

@@ -339,7 +339,7 @@ else
     jvm_cache_opts=($(cat "$jvm_file"))
   fi
   if [[ -e "$main_file" ]]; then
-    main_cache_opts=($(cat "$main_file"))
+    eval "main_cache_opts=($(cat "$main_file"))"
   fi
   exec "$JAVA_CMD" "${jvm_cache_opts[@]}" "${jvm_opts[@]}" "-Dclojure.libfile=$libs_file" -classpath "$cp" clojure.main "${main_cache_opts[@]}" "$@"
 fi

test.main

@@ -0,0 +1 @@
+-co {:aot-cache\ true}