Replace env vars with flags to the installer. (#111)

* support --prefix/--version/--help
* numerous tidy
* ++robustness

Author: mxcl

.github/smoke-test.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+set -xe
+test "$(~/.tea/tea.xyz/v0/bin/tea --prefix)" = "$HOME"/.tea

.github/workflows/cd.yml

@@ -26,13 +26,18 @@ jobs:
       - uses: andymckay/cancel-action@0.2
         if: ${{ steps.rev-parse.outputs.result == 'cancel' }}
 
-  ci:
+  ci1:
     needs: [smoke]
     uses: ./.github/workflows/ci.yml
     secrets: inherit
 
+  ci2:
+    needs: [smoke]
+    uses: ./.github/workflows/ci-pre-reqs.yml
+    secrets: inherit
+
   put:
-    needs: [ci, smoke]
+    needs: [ci1, ci2, smoke]
     runs-on: ubuntu-latest
     steps:
       - name: Create Deployment

.github/workflows/ci-pre-reqs.yml

@@ -1,4 +1,5 @@
 on:
+  workflow_call:
   pull_request:
     paths:
       - pre-reqs.ts

.github/workflows/ci.yml

@@ -16,35 +16,47 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
+        verbose:
+          - null
         os:
         - macos-latest
         - ubuntu-latest
-        VERBOSE:
-        - 1
-        - ~
+        include:
+        - os: ubuntu-latest
+          verbose: VERBOSE
     steps:
       - uses: actions/checkout@v3
       - run: echo foo > foo
-      - run: ./install.sh cat ./foo
+      - run: ./install.sh --yes cat ./foo
         env:
-          VERBOSE: ${{ matrix.VERBOSE }}
-          YES: 1
+          VERBOSE: ${{ matrix.verbose }}
+
   direct:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os:
-        - macos-latest
-        - ubuntu-latest
-        VERBOSE:
-        - 1
-        - ~
+          - macos-latest
+          - ubuntu-latest
+        prefix:
+          - ~
+          - foo
+        include:
+        - os: ubuntu-latest
+          verbose: VERBOSE
+          prefix: /opt/tea
+          # ^^ test absolute path (on mac this path is not writable with the
+          # default runner user)
     steps:
       - uses: actions/checkout@v3
-      - run: ./install.sh
+      - run: ./install.sh --yes --prefix ${{ matrix.prefix }}
+        if: ${{ matrix.prefix }}
         env:
-          VERBOSE: ${{ matrix.VERBOSE }}
-          YES: 1
+          VERBOSE: ${{ matrix.verbose }}
+      - run: ./install.sh --yes
+        if: ${{ matrix.prefix == null }}
+        env:
+          VERBOSE: ${{ matrix.verbose }}
       - run: tea --env --dump
       - run: tea test
       - run: which tea
@@ -96,6 +108,7 @@ jobs:
       - run: tea --version
       - uses: ./
       - run: tea --version
+      - run: ./install.sh   # also test our script does a headless update in this case
 
   # tests that we don’t require a “srcroot”
   emptier:
@@ -122,40 +135,55 @@ jobs:
       - run: brew install gum
       - uses: actions/checkout@v3
       - uses: ./
+      - run: test ! -d ~/.tea/charm.sh
 
   specific-version:
     runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        system:
+          - gha
+          - direct
+        version:
+          - 0.13.8
     steps:
       - uses: actions/checkout@v3
       - uses: ./
+        if: ${{ matrix.system == 'gha' }}
         with:
-          version: 0.13.8
-      - run:
-          test "$(tea --version)" = "tea 0.13.8"
+          version: ${{ matrix.version }}
+      - run: ./install.sh --yes --version ${{ matrix.version }}
+        if: ${{ matrix.system == 'direct' }}
+      - run: test "$(tea --version)" = "tea ${{ matrix.version }}"
 
   sudo-not-required:
       runs-on: ubuntu-latest
       container: debian:buster-slim
       steps:
         - uses: actions/checkout@v3
         - run: apt-get update && apt-get --yes install curl
-        - run: ./install.sh
+        - run: ./install.sh --yes
 
   sudo-required:
       runs-on: ubuntu-latest
       steps:
         - uses: actions/checkout@v3
         - run: sudo chmod go-w /usr/local/bin
         # ^^ we run as `runner` but this dir has 999 perms
-        - run: ./install.sh
+        - run: ./install.sh --yes
+        - run: .github/smoke-test.sh
+        - run: test $(which tea) = /usr/local/bin/tea
 
   no-usr-local:
       runs-on: ubuntu-latest
       steps:
         - uses: actions/checkout@v3
         - run: sudo rm -rf /usr/local # this is fine, right?
         - run: sudo chmod 777 /usr    # and this
-        - run: ./install.sh
+        - run: ./install.sh --yes
+        - run: .github/smoke-test.sh
+        - run: test $(which tea) = /usr/local/bin/tea
 
   installs-if-gitea-found:
     runs-on: ubuntu-latest
@@ -174,12 +202,13 @@ jobs:
           which tea
           tea --help
       - uses: actions/checkout@v3
-      - run: ./install.sh
-      - run: test $(~/.tea/tea.xyz/v0/bin/tea --prefix) = $HOME/.tea
+      - run: ./install.sh --yes
+      - run: .github/smoke-test.sh
 
   run-without-which:
     runs-on: ubuntu-latest
     container: archlinux:latest
     steps:
         - uses: actions/checkout@v3
-        - run: ./install.sh
+        - run: ./install.sh --yes
+        - run: .github/smoke-test.sh

README.md

@@ -2,7 +2,7 @@
 
 [`install.sh`](./install.sh) is delivered when you `curl tea.xyz`.
 
-# GitHub Action 0.8.0
+# GitHub Action 0.9.0
 
 This repository also provides the `tea` GitHub Action.
 
@@ -32,8 +32,9 @@ sh <(curl tea.xyz) +charm.sh/gum gum spin -- sleep 5
 
 ### Options
 
-* `YES=1`, for headless environments, assumes affirmative for all prompts
-* `TEA_PREFIX=/path` change install location
+* `sh <(curl tea.xyz) --yes` assumes affirmative for all prompts
+* `sh <(curl tea.xyz) --prefix foo` change install location (you can use this option to false a re-install)
+* `sh <(curl tea.xyz) --version 1.2.3` install a specific version
 
 
 ## Via GitHub Actions