newly found fixes

pkgxdev · Mar 28, 2023 · 0578683 · 0578683
1 parent ca516fa
commit 0578683
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/bin/pkg-build b/bin/pkg-build
@@ -58,7 +58,7 @@ for PKG in $PKGS; do
   fi
 
   if test -f "$ZIP"; then
-    gum "# extracing $SRCDIR"
+    gum "# extracting $SRCDIR"
     extract.ts "$ZIP" --pkg "$PKG" --output-dir "$SRCDIR"
   else
     mkdir -p "$SRCDIR"

diff --git a/bin/pkg-docker b/bin/pkg-docker
@@ -35,8 +35,11 @@ docker run \
   --volume "$TEA_PREFIX/tea.xyz/var/www":/root/.tea/tea.xyz/var/www \
   --volume /root/.tea/tea.xyz/var/pantry \
   --volume /root/.tea/tea.xyz/var/pantries \
-  --volume "$d":/brewkit \
+  --volume "$d":$d \
   --env GITHUB_TOKEN="$GITHUB_TOKEN" \
+  --env CLICOLOR_FORCE=1 \
   $ADDARGS \
   teaxyz/cli \
-  tea +deno.land /brewkit/bin/pkg-"$arg0" "$@"
+  tea +deno.land $d/bin/pkg-"$arg0" "$@"
+
+# ^^ `--volume $d:$d` for debugging: so errors in brewkit are paths on the host
diff --git a/libexec/fetch.ts b/libexec/fetch.ts
@@ -69,7 +69,7 @@ const zipfile = await (async () => {
   }
 })()
 
-console.log(zipfile!.string)
+console.log(zipfile.string)
 
 async function download({ dst, src }: { dst: Path, src: URL }) {
   if (Deno.env.get("GITHUB_ACTIONS")) {
@@ -83,9 +83,9 @@ async function download({ dst, src }: { dst: Path, src: URL }) {
       console.error({ dst, src })
       throw new Error(`cURL failed to download ${src}`)
     }
-    return dst
   } else {
     // locally using our download function as it knows how to cache properly
     useDownload().download({ dst, src })
   }
+  return dst
 }