Fixes #141; Cannot start array script lines with $

pkgxdev · Dec 13, 2023 · 40085d9 · 40085d9
1 parent 3ed2f9e
commit 40085d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/hooks/usePantry.getScript.ts b/lib/hooks/usePantry.getScript.ts
@@ -24,7 +24,13 @@ export const getScript = async (pkg: Package, key: 'build' | 'test', deps: Insta
   }
 
   const script = (input: unknown) => {
-    if (isArray(input)) input = input.map(obj => {
+    if (isString(input)) {
+      return mm.apply(validate.str(input), tokens)
+    } else if (!isArray(input)) {
+      throw new Error("script node is not string or array")
+    }
+
+    return input.map(obj => {
       if (isPlainObject(obj)) {
 
         const condition = obj["if"]
@@ -50,6 +56,8 @@ export const getScript = async (pkg: Package, key: 'build' | 'test', deps: Insta
           throw new Error('every node in a script YAML array must contain a `run` key')
         }
 
+        run = mm.apply(validate.str(input), tokens)
+
         let cd = obj['working-directory']
         if (cd) {
           cd = mm.apply(validate.str(cd), tokens)
@@ -93,7 +101,6 @@ export const getScript = async (pkg: Package, key: 'build' | 'test', deps: Insta
         return `${obj}`.trim()
       }
     }).join("\n\n")
-    return mm.apply(validate.str(input), tokens)
   }
 
   if (isPlainObject(node)) {

diff --git a/projects/stark.com/foo/package.yml b/projects/stark.com/foo/package.yml
@@ -27,6 +27,9 @@ build:
 
     # check for regression
     - test $PREFIX = {{prefix}}
+
+    # tests we support script lines starting with $
+    - ${{prefix}}/bin/stark
   env:
     PREFIX: ${{prefix}}