Corrected passing multiple args.

examples/location_expansion/BUILD.bazel

@@ -17,16 +17,33 @@ genrule(
     name = "app_cmd",
     srcs = [],
     outs = ["app_cmd.txt"],
-    cmd = "echo $(rootpaths :test.bash) > \"$@\"",
+    cmd = """
+    echo $(rootpaths :test.bash) > "$@"
+    echo "a1" >> "$@"
+    echo "a2 b2" >> "$@"
+    echo " a3\tb3 " >> "$@"
+    """,
     tools = [
         ":test.bash",
     ],
 )
 
+genrule(
+    name = "app_entrypoint",
+    srcs = [],
+    outs = ["app_entrypoint.txt"],
+    cmd = """
+    echo "env" > "$@"
+    echo "-" >> "$@"
+    """,
+    tools = [],
+)
+
 oci_image(
     name = "image",
     base = "@ubuntu",
     cmd = ":app_cmd",
+    entrypoint = ":app_entrypoint",
     tars = [":app"],
 )
 

examples/location_expansion/test.bash

@@ -1 +1,9 @@
-echo "hello world!"
+#/bin/bash
+echo "hello world!"
+
+args=("$@")
+ELEMENTS=${#args[@]}
+for (( i=0;i<$ELEMENTS;i++)); do
+    val="${args[${i}]}"
+    echo "arg ${i}:${val}"
+done

examples/location_expansion/test.yaml

@@ -3,8 +3,9 @@ schemaVersion: "2.0.0"
 commandTests:
   - name: "echo hello"
     command: "bash"
-    args: ["examples/location_expansion/test.bash"]
-    expectedOutput: ["hello world!"]
+    args: ["examples/location_expansion/test.bash", "x", "y", "l1\nl2"]
+    expectedOutput: ["hello world!", "arg 0:x", "arg 1:y", "arg 2:l1", "l2"]
 
 metadataTest:
-  cmd: ["examples/location_expansion/test.bash"]
+  cmd: ["examples/location_expansion/test.bash", "a1", "a2 b2", " a3\tb3 "]
+  entrypoint: ["env", "-"]

oci/private/image.sh.tpl

@@ -122,15 +122,20 @@ for ARG in "$@"; do
           done <"${ARG#--annotations-file=}"
           ;;
         (--cmd-file=*)
-          FIXED_ARGS+=("--cmd=$(<"${ARG#--cmd-file=}")")
+          while IFS= read -r in || [ -n "$in" ]; do
+            FIXED_ARGS+=("--cmd=$in")
+          done <"${ARG#--cmd-file=}"
           ;;
         (--entrypoint-file=*)
-          FIXED_ARGS+=("--entrypoint=$(<"${ARG#--entrypoint-file=}")")
+          while IFS= read -r in || [ -n "$in" ]; do
+            FIXED_ARGS+=("--entrypoint=$in")
+          done <"${ARG#--entrypoint-file=}"
           ;;
         (*) FIXED_ARGS+=( "${ARG}" )
     esac
 done
 
+echo "!!!: ${CRANE}" "${FIXED_ARGS[@]}"
 REF=$("${CRANE}" "${FIXED_ARGS[@]}")
 
 if [ ${#ENV_EXPANSIONS[@]} -ne 0 ]; then