From 8d85b5db8e05ef7b48b35de8e4401db4f87a0c22 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Fri, 7 Oct 2022 10:51:40 -0400
Subject: [PATCH] fixes for teaxyz/cli@0.8.0

---
 scripts/build/build.ts | 6 +++---
 scripts/test.ts        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/build/build.ts b/scripts/build/build.ts
index a7130eaa..12bbbb45 100644
--- a/scripts/build/build.ts
+++ b/scripts/build/build.ts
@@ -65,10 +65,10 @@ async function __build(pkg: Package) {
   }
 
   function mkenv() {
-    const env = useShellEnv(resolved)
+    const env = useShellEnv({ installations: resolved})
 
     if (platform == 'darwin') {
-      env.vars['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
+      env['MACOSX_DEPLOYMENT_TARGET'] = ['11.0']
     }
 
     return env
@@ -86,7 +86,7 @@ async function __build(pkg: Package) {
       cd "${src}"
 
       export SRCROOT="${src}"
-      ${expand(env.vars)}
+      ${expand(env)}
 
       ${/*FIXME hardcoded paths*/ ''}
       export PATH=/opt/tea.xyz/var/pantry/scripts/brewkit:"$PATH"
diff --git a/scripts/test.ts b/scripts/test.ts
index 4e1e2a56..f49268fb 100755
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -32,7 +32,7 @@ async function test(self: Installation) {
   const yml = await pantry.getYAML(self.pkg).parse()
   const deps = await deps4(self.pkg)
   const installations = await prepare(deps)
-  const env = useShellEnv([self, ...installations])
+  const env = useShellEnv({ installations: [self, ...installations] })
 
   let text = undent`
     #!/bin/bash
@@ -41,7 +41,7 @@ async function test(self: Installation) {
     set -o pipefail
     set -x
 
-    ${expand(env.vars)}
+    ${expand(env)}
 
     `