Additions to kind cheatsheet

.github/workflows/node.js.yml

@@ -1,32 +0,0 @@
-name: Node.js CI
-on:
-  push:
-    branches: ['main']
-  pull_request:
-jobs:
-  build:
-    name: "Fmt, Lint, & Test"
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version:
-          - 20.x
-          - latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-      - name: "Webi: Install 'shfmt' and 'shellcheck', and update PATH"
-        run: |
-          sh ./_scripts/install-ci-deps
-          echo "${HOME}/.local/bin" >> $GITHUB_PATH
-          echo "${HOME}/.local/opt/pwsh" >> $GITHUB_PATH
-      - run: shfmt --version
-      - run: shellcheck -V
-      - run: node --version
-      - run: npm run fmt
-      - run: npm ci
-      - run: npm run lint
-      - run: npm run test

.gitignore

@@ -4,4 +4,3 @@ install-*.sh
 install-*.bat
 install-*.ps1
 .*.sw*
-*.bak

.jshintignore

@@ -1 +0,0 @@
-DELETEMEnode_modules/**/*

.jshintrc

@@ -1,23 +0,0 @@
-{
-  "browser": true,
-  "node": true,
-  "esversion": 11,
-  "curly": true,
-  "sub": true,
-
-  "bitwise": true,
-  "eqeqeq": true,
-  "forin": true,
-  "freeze": true,
-  "immed": true,
-  "latedef": "nofunc",
-  "nonbsp": true,
-  "nonew": true,
-  "plusplus": true,
-  "undef": true,
-  "unused": "vars",
-  "strict": true,
-  "maxdepth": 4,
-  "maxstatements": 100,
-  "maxcomplexity": 20
-}

.prettierignore

@@ -1,4 +0,0 @@
-node_modules
-jsconfig.json
-package.json
-package-lock.json

.prettierrc

@@ -0,0 +1,6 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "singleQuote": true,
+  "proseWrap": "always"
+}

.prettierrc.json

@@ -1,9 +0,0 @@
-{
-  "bracketSpacing": true,
-  "printWidth": 80,
-  "proseWrap": "always",
-  "singleQuote": true,
-  "tabWidth": 2,
-  "trailingComma": "all",
-  "semi": true
-}

.vimrc

@@ -1,6 +0,0 @@
-" Note: You must enable per-project .vimrc in your ~/.vimrc
-" set secure
-" set exrc
-
-" PowerShell settings
-let g:ale_powershell_psscriptanalyzer_exclusions = "PSAvoidUsingWriteHost,PSUseDeclaredVarsMoreThanAssignments"

CONTRIBUTING.md

@@ -1,123 +0,0 @@
-# Guidelines for Contributing to Webi
-
-**Before you start**:
-
-- It's a good idea to try [Webi](https://webinstall.dev/) out for installing
-  developer tools for yourself before creating an installer.
-- It's also best if you take on issues for tools that you're familiar with.
-
-**Before you PR**:
-
-- You'll be asked to make changes if you don't run the code formatters and
-  linters:
-
-  - Node / JavaScript:
-    - [prettier](https://webinstall.dev/prettier)
-      ```sh
-      npm run prettier
-      ```
-    - [jshint](https://webinstall.dev/jshint)
-      ```sh
-      npm run lint
-      ```
-  - Bash
-
-    - [shfmt](https://webinstall.dev/shfmt)
-      ```sh
-      npm run shfmt
-      ```
-      Or
-      ```bash
-      shfmt -w -i 4 -sr -ci -s ./
-      ```
-    - [shellcheck](https://webinstall.dev/shellcheck) \
-      To check for all warnings and errors (except the ones we ignore):
-      ```bash
-      # to check all errors
-      shellcheck -s sh --exclude=SC2154,SC2034 */*.sh */*/*.sh
-      ```
-      To check for only specific warnings and errors:
-      ```bash
-      # to check specific errors
-      shellcheck -s sh --include=SC2005 */*.sh */*/*.sh
-      ```
-      Enumerated shellcheck codes:
-      <https://gist.github.com/nicerobot/53cee11ee0abbdc997661e65b348f375>
-    - Common exceptions:
-
-      ```text
-      # We make use of `.` (source) to import without exports
-      SC2034: foo appears unused. Verify it or export it.
-      SC2154: var is referenced but not assigned.
-      ```
-
-- If you use vim, [vim-essentials](https://webinstall.dev/vim-essentials)
-  includes everything you need to automatically format and lint on save.
-- If you use VS Code, the same plugins are also available in the VS Code store.
-
-**Not strictly mandatory, but we appreciate**:
-
-- [x] [Signed Commits](/git-config-gpg)
-- [x] Semantic Commit Messages
-- [x] Update `test` psuedo-package
-
-## Signed Commits
-
-Please **enable gpg-signing**.
-
-You can do this **in about 30 seconds**:
-
-1. Run [`git-config-gpg`](https://webinstall.dev/git-config-gpg) from Webi:
-   ```sh
-   # On Mac & Linux
-   curl https://webi.sh/git-config-gpg | sh
-   ```
-2. Copy the GPG public key (it will be printed to your screen)
-3. Add it to your GitHub profile: <https://github.com/settings/gpg/new>
-
-## Semantic Commit Messages
-
-We try to follow "semantic commits" to some degree. Especially since this is a
-project with many sub-projects.
-
-The general format is `<type>(<package>): <description>`, using these _types_:
-
-| _type_   | _usage_                                                            |
-| :------- | :----------------------------------------------------------------- |
-| feat     | new feature for the user, not a new feature for build script       |
-| fix      | bug fix for the user, not a fix to a build script                  |
-| docs     | changes to the documentation                                       |
-| style    | formatting, missing semi colons, etc; no production code change    |
-| refactor | refactoring production code, eg. renaming a variable               |
-| test     | adding missing tests, refactoring tests; no production code change |
-| chore    | updating grunt tasks etc; no production code change                |
-
-Try to write your commit messages (in the present tense) like this:
-
-```text
-fix(node): update install.sh (fix #200)
-```
-
-```text
-feat(delta): add cheat sheet and install.sh
-```
-
-```text
-docs(ssh-adduser): document that foo does bar
-```
-
-See <https://gist.github.com/joshbuchea/6f47e86d2510bce28f8e7f42ae84c716> for
-some more examples.
-
-## Also update the `test` installer (a 3-line change)
-
-Whenever adding a new installer, please also update `test/install.sh`
-
-- `rm -rf ~/.local/opt/YOUR_PACKAGE`
-- `rm -f ~/.local/bin/YOUR_PACKAGE`
-- `webi YOUR_PACKAGE`
-- (and please keep it in alphabetical order)
-
-See
-<https://github.com/webinstall/webi-installers/pull/346/files#diff-db3af85ef45ed7ac0d1d9c473cf4d858657c127dc24d931fe18a9961f17e05b1>
-for an example.

README.md

@@ -2,15 +2,13 @@
 
 > [webi](https://webinstall.dev) is how developers install their tools
 
-[![webinstall-dev-ogimage-github](https://user-images.githubusercontent.com/122831/129465590-136b5a8a-f8f5-4e8d-a010-784eaa9f21bb.png)](https://webinstall.dev)
-
 - no `sudo`
 - no package manager
 - no messing with system permissions
 - in short: no nonsense
 
-```sh
-curl https://webi.sh/webi | sh
+```bash
+curl https://webinstall.dev/webi | bash
 ```
 
 This repository contains the primary and community-submitted packages for
@@ -32,7 +30,7 @@ More technically:
    - common release APIs are in `_common/` (i.e. `_common/github.js`)
 2. `_webi/bootstrap.sh` is a template that exchanges system information for a
    correct installer
-   - constructs a user agent with os, cpu, and utility info (i.e. `macos`,
+   - contructs a user agent with os, cpu, and utility info (i.e. `macos`,
      `amd64`, can unpack `tar,zip,xz`)
 3. `_webi/template.sh` is the base installer template with common functions for
    - checking versions
@@ -41,10 +39,10 @@ More technically:
    - (re-)linking directories
 4. `<package>/install.sh` may provide functions to override `_webi/template.sh`
 5. Recap:
-   - `curl https://webi.sh/<pkg>` => `bootstrap-<pkg>.sh`
-   - `sh bootstrap-<pkg>.sh` =>
+   - `curl https://webinstall.dev/<pkg>` => `bootstrap-<pkg>.sh`
+   - `bash bootstrap-<pkg>.sh` =>
      `https://webinstall.dev/api/installers/<pkg>@<ver>.sh?formats=zip,tar`
-   - `sh install-<pkg>.sh` => download, unpack, move, link, update PATH
+   - `bash install-<pkg>.sh` => download, unpack, move, link, update PATH
 
 # Philosophy (for package authors / maintainers publishing with webi)
 
@@ -73,7 +71,7 @@ An install consists of 5 parts in 4 files:
 my-new-package/
   - README.md (package info in frontmatter)
   - releases.js
-  - install.sh (POSIX Shell)
+  - install.sh (bash)
   - install.ps1 (PowerShell)
 ```
 
@@ -88,7 +86,7 @@ See these **examples**:
 - https://github.com/webinstall/packages/blob/master/golang/
 
 The `webinstall.dev` server uses the list of releases returned by
-`<your-package>/releases.js` to generate a shell script with most necessary
+`<your-package>/releases.js` to generate a bash script with most necessary
 variables and functions pre-defined.
 
 You just fill in the blanks.
@@ -97,13 +95,13 @@ You just fill in the blanks.
 
 Just create an empty directory and run the tests until you get a good result.
 
-```sh
+```bash
 git clone git@github.com:webinstall/packages.git
 pushd packages
 npm install
 ```
 
-```sh
+```bash
 mkdir -p ./new-package/
 node _webi/test.js ./new-package/
 ```
@@ -118,13 +116,12 @@ Just copy the format from any of the existing packages. It's like this:
 ---
 title: Node.js
 homepage: https://nodejs.org
-tagline: |
-  JavaScript V8 runtime
+tagline: JavaScript V8 runtime
 description: |
   Node.js® is a JavaScript runtime built on Chrome's V8 JavaScript engine
 ---
 
-```sh
+```bash
 node -e 'console.log("Hello, World!")'
 > Hello, World!
 ```
@@ -161,7 +158,7 @@ module.exports = function (request) {
 
 (optional, if needed) Bash variables that you _may_ define:
 
-```sh
+```bash
 # Define this if the package name is different from the command name (i.e. golang => go)
 pkg_cmd_name="foobar"
 
@@ -178,16 +175,16 @@ pkg_src_cmd="$HOME/.local/opt/foobar-v$WEBI_VERSION/bin/foobar"
 
 (required) A version check function that strips all non-version junk
 
-```sh
+```bash
 pkg_get_current_version() {
     # foobar-v1.1.7 => 1.1.7
     echo "$(foobar --version | head -n 1 | sed 's:foobar-v::')"
 }
 ```
 
-For the rest of the functions you can copy/paste from the examples:
+For the rest of the functions you can like copy/paste from the examples:
 
-```sh
+```bash
 pkg_format_cmd_version() {}         # Override, pretty prints version
 
 pkg_link                            # Override, replaces webi_link()
@@ -214,7 +211,7 @@ See `webi/template.sh`
 
 These variables will be set by the server:
 
-```sh
+```bash
 WEBI_PKG=example@v1
 WEBI_TAG=v1
 WEBI_HOST=https://webinstall.dev
@@ -231,21 +228,21 @@ WEBI_PKG_URL=https://cdn.example.com/example-macos-amd64.tar.gz
 WEBI_PKG_FILE=example-macos-amd64.tar.gz
 ```
 
-```sh
+```bash
 PKG_NAME=example
 PKG_OSES=macos,linux,windows
 PKG_ARCHES=amd64,arm64,x86
 PKG_FORMATS=zip,xz
 ```
 
-```sh
+```bash
 WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-foobar.XXXXXXXX)"}
 WEBI_SINGLE=""
 ```
 
-```sh
+```bash
 webi_check              # Checks to see if the selected version is already installed (and re-links if so)
-webi_download           # Downloads the selected release to $HOME/Downloads/webi/<package-name>.tar.gz
+webi_download           # Downloads the selected release to $HOME/Downloads/<package-name>.tar.gz
 webi_extract            # Extracts the download to /tmp/<package-name>-<random>/
 webi_path_add /new/path # Adds /new/path to PATH for bash, zsh, and fish
 webi_pre_install        # Runs webi_check, webi_download, and webi_extract
@@ -270,10 +267,10 @@ webi_post_install       # Runs `webi_path_add $pkg_dst_bin`
 set WEBI_HOST=https://webinstall.dev
 ```
 
-Windows has curl too!?
+Windows 10 has curl too!?
 
 ```bat
-curl.exe -sL https://webi.ms/node | powershell
+curl.exe -sL -A "MS" https://webinstall.dev/node | powershell
 ```
 
 And it's easy enough to ignore the execution policy
@@ -286,11 +283,11 @@ And if we want something that looks as complicated as we expect Windows to be,
 historically, we have options:
 
 ```bat
-powershell "Invoke-Expression ( Invoke-WebRequest -UseBasicParsing https://webi.ms/node ).Contents"
+powershell "Invoke-Expression ( Invoke-WebRequest -UseBasicParsing https://webinstall.dev/node ).Contents"
 ```
 
 ```bat
-powershell ( Invoke-WebRequest -UseBasicParsing https://webi.ms/node ).Contents | powershell
+powershell ( Invoke-WebRequest -UseBasicParsing https://webinstall.dev/node ).Contents | powershell
 ```
 
 -->

_common/brew.js

@@ -14,7 +14,7 @@ function getAllReleases(request, formula) {
   return request({
     url: 'https://formulae.brew.sh/api/formula/' + formula + '.json',
     fail: true, // https://git.coolaj86.com/coolaj86/request.js/issues/2
-    json: true,
+    json: true
   })
     .then(failOnBadStatus)
     .then(function (resp) {
@@ -26,16 +26,16 @@ function getAllReleases(request, formula) {
       return [
         {
           version: ver,
-          download: dl.replace(/{{ v }}/g, ver),
-        },
+          download: dl.replace(/{{ v }}/g, ver)
+        }
       ].concat(
         resp.body.versioned_formulae.map(function (f) {
           var ver = f.replace(/.*@/, '');
           return {
             version: ver,
-            download: dl,
+            download: dl
           };
-        }),
+        })
       );
     })
     .catch(function (err) {

_common/gitea.js

@@ -15,11 +15,11 @@ function getAllReleases(request, owner, repo, baseurl) {
   if (!baseurl) {
     return Promise.reject('missing baseurl');
   }
-  return ghRelease(request, owner, repo, baseurl + '/api/v1').then(
-    function (all) {
-      return all;
-    },
-  );
+  return ghRelease(request, owner, repo, baseurl + '/api/v1').then(function (
+    all
+  ) {
+    return all;
+  });
 }
 
 module.exports = getAllReleases;
@@ -29,11 +29,11 @@ if (module === require.main) {
     require('@root/request'),
     'coolaj86',
     'go-pathman',
-    'https://git.coolaj86.com',
+    'https://git.coolaj86.com'
   ).then(
     //getAllReleases(require('@root/request'), 'root', 'serviceman', 'https://git.rootprojects.org').then(
     function (all) {
       console.info(JSON.stringify(all, null, 2));
-    },
+    }
   );
 }

_common/github-source.js

@@ -1,133 +0,0 @@
-'use strict';
-
-require('dotenv').config();
-
-/**
- * Gets the releases for 'ripgrep'. This function could be trimmed down and made
- * for use with any github release.
- *
- * @param request
- * @param {string} owner
- * @param {string} repo
- * @returns {PromiseLike<any> | Promise<any>}
- */
-async function getAllReleases(
-  request,
-  owner,
-  repo,
-  oses,
-  arches,
-  baseurl = 'https://api.github.com',
-) {
-  if (!owner) {
-    return Promise.reject('missing owner for repo');
-  }
-  if (!repo) {
-    return Promise.reject('missing repo name');
-  }
-
-  let req = {
-    url: `${baseurl}/repos/${owner}/${repo}/releases`,
-    json: true,
-  };
-
-  // TODO I really don't like global config, find a way to do better
-  if (process.env.GITHUB_USERNAME) {
-    req.auth = {
-      user: process.env.GITHUB_USERNAME,
-      pass: process.env.GITHUB_TOKEN,
-    };
-  }
-
-  let resp = await request(req);
-  let gHubResp = resp.body;
-  let all = {
-    releases: [],
-    // TODO make this ':baseurl' + ':releasename'
-    download: '',
-  };
-
-  for (let release of gHubResp) {
-    // TODO tags aren't always semver / sensical
-    let tag = release['tag_name'];
-    let lts = /(\b|_)(lts)(\b|_)/.test(release['tag_name']);
-    let channel = 'stable';
-    if (release['prerelease']) {
-      channel = 'beta';
-    }
-    let date = release['published_at'] || '';
-    date = date.replace(/T.*/, '');
-
-    let urls = [release.tarball_url, release.zipball_url];
-    for (let url of urls) {
-      let resp = await request({
-        method: 'HEAD',
-        followRedirect: true,
-        followAllRedirects: true,
-        followOriginalHttpMethod: true,
-        url: url,
-        stream: true,
-      });
-      // Workaround for bug where method changes to GET
-      resp.destroy();
-
-      // content-disposition: attachment; filename=BeyondCodeBootcamp-DuckDNS.sh-v1.0.1-0-ga2f4bde.zip
-      let name = resp.headers['content-disposition'].replace(
-        /.*filename=([^;]+)(;|$)/,
-        '$1',
-      );
-      all.releases.push({
-        name: name,
-        version: tag,
-        lts: lts,
-        channel: channel,
-        date: date,
-        os: '', // will be guessed by download filename
-        arch: '', // will be guessed by download filename
-        ext: '', // will be normalized
-        download: resp.request.uri.href,
-      });
-    }
-  }
-
-  if (oses) {
-    return combinate(all, oses, arches);
-  }
-
-  return all;
-}
-
-function combinate(all, oses, arches) {
-  let releases = all.releases;
-  // ex: arches = ['amd64', 'arm64', 'armv7l', 'armv6l', 'x86'];
-  // ex: oses = ['macos', 'linux', 'bsd', 'posix'];
-
-  let combos = [];
-  for (let release of releases) {
-    for (let arch of arches) {
-      for (let os of oses) {
-        let combo = {
-          arch: arch,
-          os: os,
-        };
-        let rel = Object.assign({}, release, combo);
-        combos.push(rel);
-      }
-    }
-  }
-  all.releases = combos;
-
-  return all;
-}
-
-module.exports = getAllReleases;
-
-if (module === require.main) {
-  getAllReleases(
-    require('@root/request'),
-    'BeyondCodeBootcamp',
-    'DuckDNS.sh',
-  ).then(function (all) {
-    console.info(JSON.stringify(all, null, 2));
-  });
-}

_common/github.js

@@ -11,73 +11,58 @@ require('dotenv').config();
  * @param {string} repo
  * @returns {PromiseLike<any> | Promise<any>}
  */
-async function getAllReleases(
+function getAllReleases(
   request,
   owner,
   repo,
-  baseurl = 'https://api.github.com',
+  baseurl = 'https://api.github.com'
 ) {
   if (!owner) {
-    throw new Error('missing owner for repo');
+    return Promise.reject('missing owner for repo');
   }
   if (!repo) {
-    throw new Error('missing repo name');
+    return Promise.reject('missing repo name');
   }
 
   var req = {
     url: `${baseurl}/repos/${owner}/${repo}/releases`,
-    json: true,
+    json: true
   };
-
   // TODO I really don't like global config, find a way to do better
   if (process.env.GITHUB_USERNAME) {
     req.auth = {
       user: process.env.GITHUB_USERNAME,
-      pass: process.env.GITHUB_TOKEN,
+      pass: process.env.GITHUB_TOKEN
     };
   }
 
-  let resp = await request(req);
-  if (!resp.ok) {
-    console.error('Bad Resp Headers:', resp.headers);
-    console.error('Bad Resp Body:', resp.body);
-    throw new Error('the elusive releases BOOGEYMAN strikes again');
-  }
+  return request(req).then((resp) => {
+    const gHubResp = resp.body;
+    const all = {
+      releases: [],
+      // todo make this ':baseurl' + ':releasename'
+      download: ''
+    };
 
-  let gHubResp = resp.body;
-  let all = {
-    releases: [],
-    // todo make this ':baseurl' + ':releasename'
-    download: '',
-  };
-
-  try {
-    gHubResp.forEach(transformReleases);
-  } catch (e) {
-    console.error(e.message);
-    console.error('Error Headers:', resp.headers);
-    console.error('Error Body:', resp.body);
-    throw e;
-  }
-
-  function transformReleases(release) {
-    release['assets'].forEach(function (asset) {
-      let name = asset['name'];
-      all.releases.push({
-        name: name,
-        version: release['tag_name'], // TODO tags aren't always semver / sensical
-        lts: /(\b|_)(lts)(\b|_)/.test(release['tag_name']),
-        channel: !release['prerelease'] ? 'stable' : 'beta',
-        date: (release['published_at'] || '').replace(/T.*/, ''),
-        os: '', // will be guessed by download filename
-        arch: '', // will be guessed by download filename
-        ext: '', // will be normalized
-        download: asset['browser_download_url'],
+    gHubResp.forEach((release) => {
+      release['assets'].forEach((asset) => {
+        const name = asset['name'];
+        all.releases.push({
+          name: name,
+          version: release['tag_name'], // TODO tags aren't always semver / sensical
+          lts: /(\b|_)(lts)(\b|_)/.test(release['tag_name']),
+          channel: !release['prerelease'] ? 'stable' : 'beta',
+          date: (release['published_at'] || '').replace(/T.*/, ''),
+          os: '', // will be guessed by download filename
+          arch: '', // will be guessed by download filename
+          ext: '', // will be normalized
+          download: asset['browser_download_url']
+        });
       });
     });
-  }
 
-  return all;
+    return all;
+  });
 }
 
 module.exports = getAllReleases;
@@ -86,6 +71,6 @@ if (module === require.main) {
   getAllReleases(require('@root/request'), 'BurntSushi', 'ripgrep').then(
     function (all) {
       console.info(JSON.stringify(all, null, 2));
-    },
+    }
   );
 }

_example/README.md

@@ -15,17 +15,6 @@ tagline: |
 To update or switch versions, run `webi example@stable` (or `@v2`, `@beta`,
 etc).
 
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/foo
-~/.local/opt/foo
-```
-
 ## Cheat Sheet
 
 > `foo` doesn't exist and this text should have been replaced. It doesn't do
@@ -33,7 +22,7 @@ install:
 
 To run foo:
 
-```sh
+```bash
 foo
 ```
 
@@ -41,6 +30,6 @@ foo
 
 To run foo with both bar and baz highlighting turned on:
 
-```sh
+```bash
 foo --bar=baz
 ```

_example/install.ps1

@@ -15,45 +15,47 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\foobar-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\foobar-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading foobar from $Env:WEBI_PKG_URL to $pkg_download"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading foobar from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
+    & move "$pkg_download.part" "$pkg_download"
 }
 
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing foobar"
+IF (!(Test-Path -Path "$pkg_src_cmd"))
+{
+    echo "Installing foobar"
 
     # TODO: create package-specific temp directory
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\foobar-v*" -Recurse -ErrorAction Ignore
-    Remove-Item -Path ".\foo.exe" -Recurse -ErrorAction Ignore
+        # Remove any leftover tmp cruft
+        Remove-Item -Path ".\foobar-v*" -Recurse -ErrorAction Ignore
+        Remove-Item -Path ".\foo.exe" -Recurse -ErrorAction Ignore
 
-    # NOTE: DELETE THIS COMMENT IF NOT USED
-    # Move single binary into root of temporary folder
-    #& move "$pkg_download" "foo.exe"
+        # NOTE: DELETE THIS COMMENT IF NOT USED
+        # Move single binary into root of temporary folder
+        #& move "$pkg_download" "foo.exe"
 
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
-    & tar xf "$pkg_download"
+        # Unpack archive file into this temporary directory
+        # Windows BSD-tar handles zip. Imagine that.
+        echo "Unpacking $pkg_download"
+        & tar xf "$pkg_download"
 
-    # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
-    Move-Item -Path ".\foobar-*\foo.exe" -Destination "$pkg_src_bin"
+        # Settle unpacked archive into place
+        echo "Install Location: $pkg_src_cmd"
+        New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
+        Move-Item -Path ".\foobar-*\foo.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
+echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

_example/install.sh

@@ -1,9 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# shellcheck disable=SC2034
-# "'pkg_cmd_name' appears unused. Verify it or export it."
-
-__init_foobar() {
+function __init_foobar() {
     set -e
     set -u
 
@@ -24,21 +21,19 @@ __init_foobar() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/foobar-v0.99.9/bin
-        mkdir -p "$(dirname "${pkg_src_cmd}")"
+        mkdir -p "$(dirname $pkg_src_cmd)"
 
         # mv ./foobar-*/foo ~/.local/opt/foobar-v0.99.9/bin/foo
-        mv ./foobar-*/foo "${pkg_src_cmd}"
+        mv ./foobar-*/foo "$pkg_src_cmd"
     }
 
-    # pkg_get_current_version is recommended, but not required
+    # pkg_get_current_version is recommended, but (soon) not required
     pkg_get_current_version() {
         # 'foo --version' has output in this format:
         #       foobar 0.99.9 (rev abcdef0123)
         # This trims it down to just the version number:
         #       0.99.9
-        foo --version 2> /dev/null |
-            head -n 1 |
-            cut -d ' ' -f 2
+        echo $(foo --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2)
     }
 
 }

_examples/built-with-goreleaser/README.md

@@ -16,7 +16,7 @@ Each example has four files that need to be modified, just slightly:
 
 See [./keypairs/](/keypairs/) as an example.
 
-```sh
+```bash
 rsync -av ./keypairs/ ./my-project/
 ```
 
@@ -26,7 +26,7 @@ Keypairs is packaged for Mac and Linux as `.tar.gz`, and as `.zip` for Windows.
 
 See [./arc/](/arc/) as an example.
 
-```sh
+```bash
 rsync -av ./arc/ ./my-project/
 ```
 

_examples/compressed-with-xz/README.md

@@ -16,7 +16,7 @@ Each example has four files that need to be modified, just slightly:
 
 See [./gitea/](/gitea/) as an example.
 
-```sh
+```bash
 rsync -av ./keypairs/ ./my-project/
 ```
 

_npm/README.md

@@ -11,7 +11,7 @@ Effortlessly install developer tools with easy-to-remember URLs.
 
 ## Install webi via npm:
 
-```sh
+```bash
 npm install -g webi
 ```
 
@@ -19,14 +19,14 @@ npm install -g webi
 
 Mac & Linux:
 
-```sh
-curl -fsS https://webi.sh/node | sh
+```bash
+curl -fsS https://webinstall.dev/node | bash
 ```
 
-Windows (includes `curl.exe` and PowerShell by default):
+Windows 10 (includes `curl.exe` and PowerShell by default):
 
-```sh
-curl.exe -fsSA "MS" https://webi.ms/node | powershell
+```bash
+curl.exe -fsSA "MS" https://webinstall.dev/node | powershell
 ```
 
 ## Example: Switching node versions
@@ -34,7 +34,7 @@ curl.exe -fsSA "MS" https://webi.ms/node | powershell
 Once `webi` is installed, you can then install commands or switch versions with
 webi itself:
 
-```sh
+```bash
 webi node@stable
 webi node@lts
 webi node@v10

_npm/lib/exec.js

@@ -1,12 +1,15 @@
 'use strict';
 
+var pkg = require('../package.json');
 var spawn = require('child_process').spawn;
+var os = require('os');
+var path = require('path');
 
 function spawner(args) {
   return new Promise(function (resolve, reject) {
     var bin = args.shift();
     var runner = spawn(bin, args, {
-      windowsHide: true,
+      windowsHide: true
     });
     runner.stdout.on('data', function (chunk) {
       console.info(chunk.toString('utf8'));

_npm/scripts/install-webi.js

@@ -14,12 +14,18 @@ if (/^win/i.test(os.platform())) {
   console.warn("This npm installer doesn't work on windows yet.");
   console.warn('Copy and paste this into cmd.exe or PowerShell instead:');
   console.warn('');
-  console.warn('    curl.exe -fsS https://webi.ms/webi | powershell');
+  console.warn(
+    "    curl.exe -fsSA 'MS' https://webinstall.dev/webi | powershell"
+  );
   console.warn('');
   return;
 }
 
-exec('curl -fsS https://webi.sh/webi | sh', function (err, stdout, stderr) {
+exec('curl -fsS https://webinstall.dev/webi | bash', function (
+  err,
+  stdout,
+  stderr
+) {
   if (err) {
     console.error(err);
   }

_scripts/git-hooks-init.js

@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-var Fs = require('node:fs/promises');
-var Path = require('node:path');
-
-async function copyScripts() {
-  var pkgDir = Path.join(__dirname, '..');
-  var scriptsDir = Path.join(pkgDir, '_scripts');
-  var gitFile = Path.join(pkgDir, '.git');
-
-  // if this is a submodule, '.git' will be a file with a
-  // path to the actual git module directory
-  var gitDir = await Fs.readFile(gitFile, 'utf8')
-    .catch(function (e) {
-      // console.error(e);
-      //return 'gitdir: ../.git/modules/installers';
-      return 'gitdir: ./.git';
-    })
-    .then(function (str) {
-      var parts = str.split(': ');
-      str = parts[1];
-      str = str.trim();
-
-      return Path.resolve(pkgDir, str);
-    });
-
-  var gitHooksDir = Path.join(gitDir, 'hooks');
-
-  var src = Path.join(scriptsDir, 'git-hooks-pre-commit.js');
-  var dst = Path.join(gitHooksDir, 'pre-commit');
-
-  console.info(`[git-hooks] Checking for pre-commit hooks...`);
-  var relSrc = Path.relative(pkgDir, src);
-  var relDst = Path.relative(pkgDir, dst);
-  await Fs.access(dst)
-    .then(function () {
-      console.info(`[git-hooks] Found ${relDst}`);
-    })
-    .catch(async function (e) {
-      // ignore e
-      await Fs.mkdir(gitHooksDir, { recursive: true });
-      await Fs.copyFile(src, dst);
-      await Fs.chmod(dst, 0o755);
-      console.info(`[git-hooks] Found template ${relSrc}`);
-      console.info(`[git-hooks] Initialized ${relDst}`);
-    });
-}
-
-copyScripts()
-  .then(function () {
-    process.exit(0);
-  })
-  .catch(function (e) {
-    console.error(e);
-    process.exit(1);
-  });

_scripts/git-hooks-pre-commit

@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-npm run fmt
-npm run lint
-npm run test

_scripts/git-hooks-pre-commit.js

@@ -1,12 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-var Process = require('child_process');
-
-var procOpts = { stdio: 'inherit' };
-var commands = ['npm run fmt', 'npm run lint', 'npm run test'];
-
-for (let cmd of commands) {
-  console.info(`[pre-commit] exec: ${cmd}`);
-  Process.execSync(cmd, procOpts);
-}

_scripts/install-ci-deps

@@ -1,15 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# Install 'shfmt 3.7.x'
-curl -fsS https://webi.sh/shfmt@3.7 | sh
-
-# Install 'shellcheck v0.9.x'
-curl -fsS https://webi.sh/shellcheck@0.9 | sh
-
-# Install 'pwsh (PowerShell Core) v7.x'
-curl -fsS https://webi.sh/pwsh@7 | sh
-# shellcheck disable=SC1090
-. ~/.config/envman/PATH.env
-pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"

_scripts/pwsh-fmt

@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-echo "Formatting */*.ps1 ... "
-for my_ps1 in */*.ps1; do
-    my_dir="$(
-        dirname "${my_ps1}"
-    )"
-    if test -L "${my_ps1}" ||
-        test -L "${my_dir}" ||
-        ! test -f "${my_ps1}" ||
-        ! test -d "${my_dir}"; then
-        printf '    SKIP %s (non-regular file or parent directory)\n' "${my_ps1}"
-        continue
-    fi
-
-    printf "    %s" "${my_ps1}"
-
-    # -Settings ./Settings/CodeFormatting.psd1
-    my_new_file="$(
-        pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '${my_ps1}' -Raw)"
-    )"
-    printf '%s\n' "${my_new_file}" > "${my_ps1}"
-
-    printf '\n'
-done

_scripts/pwsh-fmt.ps1

@@ -1,40 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = "Stop"
-
-Write-Host "Formatting */*.ps1 ... "
-
-$my_cwd = Get-Location
-$my_dirs = Get-ChildItem -Directory
-$my_status = 0
-
-foreach ($my_dir in $my_dirs) {
-
-    $my_files = Get-ChildItem -Path $my_dir.FullName -File -Filter *.ps1
-    foreach ($my_file in $my_files) {
-        $my_ps1 = [System.IO.Path]::GetRelativePath($my_cwd, $my_file.FullName)
-        $my_dir = [System.IO.Path]::GetDirectoryName($my_file.FullName)
-
-        if (-Not (Test-Path -PathType Leaf -Path $my_ps1) -or
-            -Not (Test-Path -PathType Container -Path $my_dir)) {
-            Write-Host ("    SKIP {0} (non-regular file or parent directory)" -f $my_ps1)
-            continue
-        }
-
-        Write-Host ("    {0}" -f $my_ps1)
-
-        $text = Get-Content -Path $my_ps1 -Raw
-        $my_new_file = Invoke-Formatter -ScriptDefinition $text
-        $my_new_file = $my_new_file.Trim()
-
-        # note: trailing newline is added back on write
-        $my_new_file | Set-Content -Path $my_ps1
-
-        $my_new_file = $my_new_file + "`n"
-        IF ($text -ne $my_new_file) {
-            $my_status = 1
-        }
-    }
-}
-
-exit $my_status

_scripts/pwsh-lint

@@ -1,36 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-echo "Formatting */*.ps1 ..."
-
-for my_ps1 in */*.ps1; do
-    my_dir="$(
-        dirname "${my_ps1}"
-    )"
-    if test -L "${my_ps1}" ||
-        test -L "${my_dir}" ||
-        ! test -f "${my_ps1}" ||
-        ! test -d "${my_dir}"; then
-        printf '    SKIP %s (non-regular file or parent directory)\n' "${my_ps1}"
-        continue
-    fi
-
-    printf "    %s" "${my_ps1}"
-
-    # -Settings ./PSScriptAnalyzerSettings.psd1
-    pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost,PSUseDeclaredVarsMoreThanAssignment -Path '$my_ps1'"
-
-    #
-    # fmt MUST happen after lint due to Byte-Order Marker (BOM) issues
-    # See https://github.com/PowerShell/PSScriptAnalyzer/issues/1743
-    #
-
-    # -Settings ./Settings/CodeFormatting.psd1
-    my_new_file="$(
-        pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '${my_ps1}' -Raw)"
-    )"
-    printf '%s\n' "${my_new_file}" > "${my_ps1}"
-
-    printf '\n'
-done

_scripts/pwsh-lint.ps1

@@ -1,48 +0,0 @@
-#!/usr/bin/env pwsh
-
-$ErrorActionPreference = "Stop"
-
-Write-Host "Linting */*.ps1 ... "
-
-$my_cwd = Get-Location
-$my_dirs = Get-ChildItem -Directory
-$my_status = 0
-
-foreach ($my_dir in $my_dirs) {
-
-    $my_files = Get-ChildItem -Path $my_dir.FullName -File -Filter *.ps1
-    foreach ($my_file in $my_files) {
-        $my_ps1 = [System.IO.Path]::GetRelativePath($my_cwd, $my_file.FullName)
-        $my_dir = [System.IO.Path]::GetDirectoryName($my_file.FullName)
-
-        if (-Not (Test-Path -PathType Leaf -Path $my_ps1) -or
-            -Not (Test-Path -PathType Container -Path $my_dir)) {
-            Write-Host ("    SKIP {0} (non-regular file or parent directory)" -f $my_ps1)
-            continue
-        }
-
-        Write-Host ("    {0}" -f $my_ps1)
-
-        $my_old_file = (Get-Content -Path $my_ps1 -Raw)
-        Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost, PSUseDeclaredVarsMoreThanAssignment -Path $my_ps1
-
-        #
-        # fmt MUST happen after lint due to Byte-Order Marker (BOM) issues
-        # See https://github.com/PowerShell/PSScriptAnalyzer/issues/1743
-        #
-
-        $my_fixed_file = (Get-Content -Path $my_ps1 -Raw)
-        $my_new_file = Invoke-Formatter -ScriptDefinition $my_fixed_file
-        $my_new_file = $my_new_file.Trim()
-
-        # note: trailing newline is added back on write
-        $my_new_file | Set-Content -Path $my_ps1
-
-        $my_new_file = $my_new_file + "`n"
-        IF ($my_old_file -ne $my_new_file) {
-            $my_status = 1
-        }
-    }
-}
-
-exit $my_status

_scripts/tooling-init.js

@@ -1,32 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-var Cmd = require('node:child_process');
-var Os = require('node:os');
-
-var procOpts = { stdio: 'inherit' };
-var commands = ['shfmt --version', 'shellcheck --version'];
-
-for (let cmd of commands) {
-  console.info(`[tooling-init] checking for '${cmd}':`);
-  try {
-    Cmd.execSync(cmd, procOpts);
-  } catch (e) {
-    // ignore e
-    printInstallHelp(cmd);
-    process.exit(1);
-  }
-}
-
-function printInstallHelp(cmd) {
-  console.error('');
-  console.error('ERROR');
-  console.error(`        could not run '${cmd}'`);
-  console.error('POSSIBLE FIX');
-  if (/^win/i.test(Os.platform())) {
-    console.error(`        curl.exe https://webi.ms/${cmd} | powershell`);
-  } else {
-    console.error(`        curl -fsS https://webi.sh/${cmd} | sh`);
-  }
-  console.error('');
-}

_vim-example/README.md

@@ -26,7 +26,7 @@ If there are some important key bindings, use a table like this:
 
 1. Place EXAMPLE into your `~/.vim/pack/plugins/start`:
 
-   ```sh
+   ```bash
    mkdir -p ~/.vim/pack/plugins/start/
    git clone --depth=1 https://github.com/CHANGEME/EXAMPLE.git ~/.vim/pack/plugins/start/example
    ```

_vim-example/install.ps1

@@ -1,7 +1,7 @@
 #!/usr/bin/env pwsh
 
 IF (!(Test-Path -Path "$Env:USERPROFILE\.vim\pack\plugins\start")) {
-    New-Item -Path "$Env:USERPROFILE\.vim\pack\plugins\start" -ItemType Directory -Force | Out-Null
+    New-Item -Path "$Env:USERPROFILE\.vim\pack\plugins\start" -ItemType Directory -Force | out-null
 }
 Remove-Item -Path "$Env:USERPROFILE\.vim\pack\plugins\start\example" -Recurse -ErrorAction Ignore
 & git clone --depth=1 https://github.com/CHANGEME/example.git "$Env:USERPROFILE\.vim\pack\plugins\start\example"

_vim-example/install.sh

@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-__init_vim_example() {
+function __init_vim_example() {
     set -e
     set -u
 

_webi/bootstrap.ps1

@@ -1,12 +1,6 @@
 # Download the latest webi, then install {{ exename }}
-# <pre>
-############################################################
-# <h1>Cheat Sheet at CHEATSHEET_URL</h1>
-# <meta http-equiv="refresh" content="3; URL='CHEATSHEET_URL'" />
-############################################################
-New-Item -Path "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-New-Item -Path "$Env:USERPROFILE\.local\bin" -ItemType Directory -Force | Out-Null
-IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
+New-Item -Path .local\bin -ItemType Directory -Force | out-null
+IF ($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
 curl.exe -s -A "windows" "$Env:WEBI_HOST/packages/_webi/webi-pwsh.ps1" -o "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1"
 Set-ExecutionPolicy -Scope Process Bypass
 & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" "{{ exename }}"

_webi/bootstrap.sh

@@ -1,28 +1,18 @@
-#!/bin/sh
-#<pre>
-
-############################################################
-# <h1>Cheat Sheet at CHEATSHEET_URL</h1>
-# <meta http-equiv="refresh" content="3; URL='CHEATSHEET_URL'" />
-############################################################
+#!/bin/bash
 
 #set -x
 
-__install_webi() {
+function __install_webi() {
 
     #WEBI_PKG=
     #WEBI_HOST=https://webinstall.dev
     export WEBI_HOST
 
     echo ""
-    printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s/%s\e[0m'.\n" "${WEBI_PKG-}" "$(uname -s)/$(uname -r)" "$(uname -m)"
+    echo "Thanks for using webi to install '${WEBI_PKG:-}' on '$(uname -s)/$(uname -m)'."
     echo "Have a problem? Experience a bug? Please let us know:"
-    printf "        \e[2m\e[36mhttps://github.com/webinstall/webi-installers/issues\e[0m\n"
+    echo "        https://github.com/webinstall/packages/issues"
     echo ""
-    printf "\e[35mLovin'\e[0m it? Say thanks with a \e[1m\e[33mStar on GitHub\e[0m:\n"
-    printf "        \e[36mhttps://github.com/webinstall/webi-installers\e[0m\n"
-    echo ""
-
     WEBI_WELCOME=true
     export WEBI_WELCOME
 
@@ -32,15 +22,15 @@ __install_webi() {
     mkdir -p "$HOME/.local/bin"
 
     cat << EOF > "$HOME/.local/bin/webi"
-#!/bin/sh
+#!/bin/bash
 
 set -e
 set -u
 #set -x
 
-__webi_main() {
+function __webi_main () {
 
-    export WEBI_TIMESTAMP="\$(date +%F_%H-%M-%S)"
+    export WEBI_TIMESTAMP=\$(date +%F_%H-%M-%S)
     export _webi_tmp="\${_webi_tmp:-\$(mktemp -d -t webi-\$WEBI_TIMESTAMP.XXXXXXXX)}"
 
     if [ -n "\${_WEBI_PARENT:-}" ]; then
@@ -92,45 +82,39 @@ __webi_main() {
     export WEBI_WGET="\$(command -v wget)"
     set -e
 
-    my_libc=''
-    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
-        my_libc=' musl-native'
-    fi
-
     export WEBI_HOST="\${WEBI_HOST:-https://webinstall.dev}"
-    export WEBI_UA="\$(uname -s)/\$(uname -r) \$(uname -m)/unknown\${my_libc}"
+    export WEBI_UA="\$(uname -a)"
 
 
-    webinstall() {
+    function webinstall() {
 
         my_package="\${1:-}"
         if [ -z "\$my_package" ]; then
-            echo >&2 "Usage: webi <package>@<version> ..."
-            echo >&2 "Example: webi node@lts rg"
+            >&2 echo "Usage: webi <package>@<version> ..."
+            >&2 echo "Example: webi node@lts rg"
             exit 1
         fi
 
         export WEBI_BOOT="\$(mktemp -d -t "\$my_package-bootstrap.\$WEBI_TIMESTAMP.XXXXXXXX")"
 
         my_installer_url="\$WEBI_HOST/api/installers/\$my_package.sh?formats=\$my_ext"
+        set +e
         if [ -n "\$WEBI_CURL" ]; then
-            if !  curl -fsSL "\$my_installer_url" -H "User-Agent: curl \$WEBI_UA" \\
-                -o "\$WEBI_BOOT/\$my_package-bootstrap.sh"; then
-                echo >&2 "error fetching '\$my_installer_url'"
-                exit 1
-            fi
+            curl -fsSL "\$my_installer_url" -H "User-Agent: curl \$WEBI_UA" \\
+                -o "\$WEBI_BOOT/\$my_package-bootstrap.sh"
         else
-            if !  wget -q "\$my_installer_url" --user-agent="wget \$WEBI_UA" \\
-                -O "\$WEBI_BOOT/\$my_package-bootstrap.sh"; then
-                echo >&2 "error fetching '\$my_installer_url'"
-                exit 1
-            fi
+            wget -q "\$my_installer_url" --user-agent="wget \$WEBI_UA" \\
+                -O "\$WEBI_BOOT/\$my_package-bootstrap.sh"
         fi
+        if ! [ \$? -eq 0 ]; then
+          >&2 echo "error fetching '\$my_installer_url'"
+          exit 1
+        fi
+        set -e
 
-        (
-            cd "\$WEBI_BOOT"
-            sh "\$my_package-bootstrap.sh"
-        )
+        pushd "\$WEBI_BOOT" 2>&1 > /dev/null
+            bash "\$my_package-bootstrap.sh"
+        popd 2>&1 > /dev/null
 
         rm -rf "\$WEBI_BOOT"
 
@@ -138,17 +122,18 @@ __webi_main() {
 
     show_path_updates() {
 
-        if test -z "\${_WEBI_CHILD}"; then
-            if test -f "\$_webi_tmp/.PATH.env"; then
-                my_paths=\$(sort -u < "\$_webi_tmp/.PATH.env")
-                if test -n "\$my_paths"; then
-                    printf 'PATH.env updated with:\\n'
-                    printf "%s\\n" "\$my_paths"
-                    printf '\\n'
-                    printf "\\e[1m\\e[35mTO FINISH\\e[0m: copy, paste & run the following command:\\n"
-                    printf "\\n"
-                    printf "        \\e[1m\\e[32msource ~/.config/envman/PATH.env\\e[0m\\n"
-                    printf "        (newly opened terminal windows will update automatically)\\n"
+        if ! [ -n "\${_WEBI_CHILD}" ]; then
+            if [ -f "\$_webi_tmp/.PATH.env" ]; then
+                my_paths=\$(cat "\$_webi_tmp/.PATH.env" | sort -u)
+                if [ -n "\$my_paths" ]; then
+                    echo "IMPORTANT: You must update you PATH to use the installed program(s)"
+                    echo ""
+                    echo "You can either"
+                    echo "A) can CLOSE and REOPEN Terminal or"
+                    echo "B) RUN these exports:"
+                    echo ""
+                    echo "\$my_paths"
+                    echo ""
                 fi
                 rm -f "\$_webi_tmp/.PATH.env"
             fi
@@ -156,55 +141,8 @@ __webi_main() {
 
     }
 
-    version() {
-        my_version=v1.1.15
-        printf "\\e[35mwebi\\e[32m %s\\e[0m Copyright 2020+ AJ ONeal\\n" "\${my_version}"
-        printf "    \\e[36mhttps://webinstall.dev/webi\\e[0m\\n"
-    }
-
-    # show help if no params given or help flags are used
-    usage() {
-        echo ""
-        version
-        echo ""
-
-        printf "\\e[1mSUMMARY\\e[0m\\n"
-        echo "    Webi is the best way to install the modern developer tools you love."
-        echo "    It's fast, easy-to-remember, and conflict free."
-        echo ""
-        printf "\\e[1mUSAGE\\e[0m\\n"
-        echo "    webi <thing1>[@version] [thing2] ..."
-        echo ""
-        printf "\\e[1mUNINSTALL\\e[0m\\n"
-        echo "    Almost everything that is installed with webi is scoped to"
-        echo "    ~/.local/opt/<thing1>, so you can remove it like so:"
-        echo ""
-        echo "    rm -rf ~/.local/opt/<thing1>"
-        echo "    rm -f ~/.local/bin/<thing1>"
-        echo ""
-        echo "    Some packages have special uninstall instructions, check"
-        echo "    https://webinstall.dev/<thing1> to be sure."
-        echo ""
-        printf "\\e[1mFAQ\\e[0m\\n"
-        printf "    See \\e[34mhttps://webinstall.dev/faq\\e[0m\\n"
-        echo ""
-        printf "\\e[1mALWAYS REMEMBER\\e[0m\\n"
-        echo "    Friends don't let friends use brew for simple, modern tools that don't need it."
-        echo "    (and certainly not apt either **shudder**)"
-        echo ""
-    }
-
-    if [ \$# -eq 0 ] || echo "\$1" | grep -q -E '^(-V|--version|version)$'; then
-        version
-        exit 0
-    fi
-
-    if echo "\$1" | grep -q -E '^(-h|--help|help)$'; then
-        usage "\$@"
-        exit 0
-    fi
-
-    for pkgname in "\$@"; do
+    for pkgname in "\$@"
+    do
         webinstall "\$pkgname"
     done
 
@@ -218,13 +156,13 @@ EOF
 
     chmod a+x "$HOME/.local/bin/webi"
 
-    if [ -n "${WEBI_PKG-}" ]; then
+    if [ -n "${WEBI_PKG:-}" ]; then
         "$HOME/.local/bin/webi" "${WEBI_PKG}"
     else
         echo ""
         echo "Hmm... no WEBI_PKG was specified. This is probably an error in the script."
         echo ""
-        echo "Please open an issue with this information: Package '${WEBI_PKG-}' on '$(uname -s)/$(uname -r) $(uname -m)'"
+        echo "Please open an issue with this information: Package '${WEBI_PKG:-}' on '$(uname -s)/$(uname -m)'"
         echo "    https://github.com/webinstall/packages/issues"
         echo ""
     fi

_webi/example_install_safe_copy.sh

@@ -1,19 +1,14 @@
-#!/bin/sh
-set -e
-set -u
-
 # For installing from the extracted package tmp directory
 pkg_install() {
-    (
-        cd "$WEBI_TMP"
+    pushd "$WEBI_TMP" 2>&1 > /dev/null
 
-        if command -v rsync 2> /dev/null | grep -q rsync; then
-            rsync -Krl ./xmpl*/ "$pkg_src/" 2> /dev/null
-        else
-            cp -Hr ./xmpl*/* "$pkg_src/" 2> /dev/null
-            cp -Hr ./xmpl*/.* "$pkg_src/" 2> /dev/null
-        fi
-        rm -rf ./xmpl*
+    if [ -n "$(command -v rsync 2> /dev/null | grep rsync)" ]; then
+        rsync -Krl ./xmpl*/ "$pkg_src/" 2> /dev/null
+    else
+        cp -Hr ./xmpl*/* "$pkg_src/" 2> /dev/null
+        cp -Hr ./xmpl*/.* "$pkg_src/" 2> /dev/null
+    fi
+    rm -rf ./xmpl*
 
-    )
+    popd 2>&1 > /dev/null
 }

_webi/frontmarker.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var fs = require('fs');
-var marked = require('marked').marked;
+var marked = require('marked');
 
 var frontmatter = '---';
 var keyValRe = /(\w+): (.*)/;
@@ -12,6 +12,7 @@ function parseYamlish(txt) {
   var block = false;
 
   var lines = txt.trim().split('\n');
+  var moreRe = /\s+/;
   var last;
 
   if (frontmatter !== lines.shift()) {
@@ -19,7 +20,7 @@ function parseYamlish(txt) {
   }
 
   function unblock() {
-    cfg[block] = marked.parse(cfg[block]);
+    cfg[block] = marked(cfg[block]);
     block = false;
   }
 
@@ -57,7 +58,7 @@ function parseYamlish(txt) {
     var m = line.match(keyValRe);
     if (!m) {
       throw new Error(
-        'invalid key format for: ' + JSON.stringify(line) + ' ' + i,
+        'invalid key format for: ' + JSON.stringify(line) + ' ' + i
       );
     }
     if ('|' === m[2]) {
@@ -68,9 +69,9 @@ function parseYamlish(txt) {
   });
 
   if (block) {
-    cfg[block] = marked.parse(cfg[block]);
+    cfg[block] = marked(cfg[block]);
   }
-  cfg.examples = marked.parse(lines.slice(last).join('\n'));
+  cfg.examples = marked(lines.slice(last).join('\n'));
 
   return cfg;
 }
@@ -79,6 +80,8 @@ module.exports.parse = parseYamlish;
 
 if (require.main === module) {
   console.info(
-    parseYamlish(fs.readFileSync(__dirname + '/../node/README.md', 'utf8')),
+    parseYamlish(
+      fs.readFileSync(__dirname + '/../node/README.md', 'utf8')
+    )
   );
 }

_webi/normalize.js

@@ -7,13 +7,13 @@ var osMap = {
   freebsd: /(\b|_)(freebsd)/i,
   windows: /(\b|_)(win|microsoft|msft)/i,
   sunos: /(\b|_)(sun)/i,
-  aix: /(\b|_)(aix)/i,
+  aix: /(\b|_)(aix)/i
 };
 
 var maps = {
   oses: {},
   arches: {},
-  formats: {},
+  formats: {}
 };
 
 Object.keys(osMap).forEach(function (name) {
@@ -28,38 +28,26 @@ formats.forEach(function (name) {
 // evaluation order matters
 // (i.e. otherwise x86 and x64 can cross match)
 var arches = [
-  // arm 7 cannot be confused with arm64
-  'armv7l',
-  // amd64 is more likely than arm64
-  'amd64',
-  // arm6 has the same prefix as arm64
-  'armv6l',
-  // arm64 is more likely than arm6, and should be the default
+  'amd64', // first and most likely match
   'arm64',
   'x86',
   'ppc64le',
   'ppc64',
-  's390x',
+  'armv7l',
+  'armv6l',
+  's390x'
 ];
-// Used for detecting system arch from package download url, for example:
-//
-// https://git.com/org/foo/releases/v0.7.9/foo-aarch64-linux-musl.tar.gz
-// https://git.com/org/foo/releases/v0.7.9/foo-arm-linux-musleabihf.tar.gz
-// https://git.com/org/foo/releases/v0.7.9/foo-armv7-linux-musleabihf.tar.gz
-// https://git.com/org/foo/releases/v0.7.9/foo-x86_64-linux-musl.tar.gz
-//
 var archMap = {
-  armv7l: /(\b|_)(armv?7l?)/i,
   //amd64: /(amd.?64|x64|[_\-]64)/i,
-  amd64:
-    /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64([_\-]?bit)?(\b|_)/i,
+  amd64: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)64([_\-]?bit)?(\b|_)/i,
   //x86: /(86)(\b|_)/i,
-  armv6l: /(\b|_)(aarch32|armv?6l?)(\b|_)/i,
-  arm64: /(\b|_)((aarch|arm)64|arm)/i,
   x86: /(\b|_|amd|(dar)?win(dows)?|mac(os)?|linux|osx|x)(86|32)([_\-]?bit)(\b|_)/i,
   ppc64le: /(\b|_)(ppc64le)/i,
   ppc64: /(\b|_)(ppc64)(\b|_)/i,
-  s390x: /(\b|_)(s390x)/i,
+  arm64: /(\b|_)((aarch|arm)64|arm)/i,
+  armv7l: /(\b|_)(armv?7l)/i,
+  armv6l: /(\b|_)(aarch32|armv?6l)/i,
+  s390x: /(\b|_)(s390x)/i
 };
 arches.forEach(function (name) {
   maps.arches[name] = true;
@@ -69,11 +57,10 @@ function normalize(all) {
   var supported = {
     oses: {},
     arches: {},
-    formats: {},
+    formats: {}
   };
 
   all.releases.forEach(function (rel) {
-    /* jshint maxcomplexity:25 */
     rel.version = rel.version.replace(/^v/i, '');
     if (!rel.name) {
       rel.name = rel.download.replace(/.*\//, '');
@@ -84,26 +71,16 @@ function normalize(all) {
           return osMap[regKey].test(rel.name || rel.download);
         }) || 'unknown';
     }
-    // Hacky-doo for musl
-    // TODO some sort of glibc vs musl tag?
-    if (!rel._musl_native) {
-      if (!rel._musl) {
-        if (/(\b|\.|_|-)(musl)(\b|\.|_|-)/.test(rel.download)) {
-          rel._musl = true;
-        }
-      }
-    }
     supported.oses[rel.os] = true;
 
     if (!rel.arch) {
-      for (let arch of arches) {
-        let name = rel.name || rel.download;
-        let isArch = name.match(archMap[arch]);
-        if (isArch) {
+      arches.some(function (regKey) {
+        var arch = (rel.name || rel.download).match(archMap[regKey]) && regKey;
+        if (arch) {
           rel.arch = arch;
-          break;
+          return true;
         }
-      }
+      });
     }
     if (!rel.arch) {
       if ('macos' === rel.os) {
@@ -126,7 +103,7 @@ function normalize(all) {
       if ('tar' === exts[1]) {
         rel.ext = exts.reverse().join('.');
         tarExt = 'tar';
-      } else if ('tgz' === exts[0]) {
+      } else if ('tgz' == exts[0]) {
         rel.ext = 'tar.gz';
         tarExt = 'tar';
       } else {

_webi/packages.js

@@ -1,6 +1,7 @@
 'use strict';
 
 var frontmarker = require('./frontmarker.js');
+var shmatter = require('shmatter');
 var fs = require('fs');
 var path = require('path');
 
@@ -39,6 +40,7 @@ pkgs.create = function (Pkgs, basepath) {
     });
   };
   Pkgs._get = function (node) {
+    var yash = path.join(basepath, node, 'package.yash');
     var curlbash = path.join(basepath, node, 'install.sh');
     var readme = path.join(basepath, node, 'README.md');
     var winstall = path.join(basepath, node, 'install.ps1');
@@ -55,14 +57,30 @@ pkgs.create = function (Pkgs, basepath) {
             console.error(e);
           }
         }),
-      fs.promises.access(curlbash).catch(function (e) {
-        // no *nix installer
-        curlbash = '';
-        if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
-          console.error("failed to parse '" + node + "/install.sh'");
-          console.error(e);
-        }
-      }),
+      fs.promises
+        .readFile(yash, 'utf-8')
+        .then(function (txt) {
+          return shmatter.parse(txt);
+        })
+        .catch(function (e) {
+          // no yash package description
+          yash = '';
+          if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
+            console.error("failed to parse '" + node + "/package.yash'");
+            console.error(e);
+          }
+          return fs.promises.readFile(curlbash, 'utf-8').then(function (txt) {
+            return shmatter.parse(txt);
+          });
+        })
+        .catch(function (e) {
+          // no *nix installer
+          curlbash = '';
+          if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
+            console.error("failed to parse '" + node + "/install.sh'");
+            console.error(e);
+          }
+        }),
       fs.promises.access(winstall).catch(function (e) {
         // no winstaller
         winstall = '';
@@ -70,7 +88,7 @@ pkgs.create = function (Pkgs, basepath) {
           console.error("failed to read '" + node + "/install.ps1'");
           console.error(e);
         }
-      }),
+      })
     ]).then(function (items) {
       var meta = items[0] || items[1];
       if (!meta) {

_webi/releases.js

@@ -1,7 +1,7 @@
 'use strict';
 
-var fs = require('node:fs');
-var path = require('node:path');
+var fs = require('fs');
+var path = require('path');
 var request = require('@root/request');
 var _normalize = require('../_webi/normalize.js');
 
@@ -9,28 +9,25 @@ var reInstallTpl = /\s*#?\s*{{ installer }}/;
 
 var Releases = module.exports;
 Releases.get = async function (pkgdir) {
-  let get;
+  var get;
   try {
     get = require(path.join(pkgdir, 'releases.js'));
   } catch (e) {
-    let err = new Error('no releases.js for', pkgdir.split(/[\/\\]+/).pop());
-    err.code = 'E_NO_RELEASE';
-    throw err;
+    throw new Error('no releases.js for', pkgdir.split(/[\/\\]+/).pop());
   }
-
-  let all = await get(request);
-
-  return _normalize(all);
+  return get(request).then(function (all) {
+    return _normalize(all);
+  });
 };
 
 function padScript(txt) {
   return txt.replace(/^/g, '        ');
 }
 
-Releases.renderBash = async function (
+Releases.renderBash = function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os = '', arch = '', formats },
+  { baseurl, pkg, tag, ver, os, arch, formats }
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -50,25 +47,25 @@ Releases.renderBash = async function (
         build: vers
           .join('.')
           .replace(/[^+\-]*/, '')
-          .replace(/^-/, ''),
+          .replace(/^-/, '')
       };
       var pkgFile = rel.filename || rel.name;
       return fs.promises
         .readFile(path.join(__dirname, 'template.sh'), 'utf8')
         .then(function (tplTxt) {
-          // ex: 'node@lts' or 'node'
-          var webiPkg = pkg;
-          if (ver) {
-            webiPkg += `@${ver}`;
-          }
           return (
             tplTxt
-              .replace(/CHEATSHEET_URL/g, `${baseurl}/${pkg}`)
-              .replace(/^\s*#?WEBI_PKG=.*/m, `WEBI_PKG='${webiPkg}'`)
-              .replace(/^\s*#?WEBI_HOST=.*/m, `WEBI_HOST='${baseurl}'`)
-              .replace(/^\s*#?WEBI_OS=.*/m, `WEBI_OS='${os}'`)
-              .replace(/^\s*#?WEBI_ARCH=.*/m, `WEBI_ARCH='${arch}'`)
-              .replace(/^\s*#?WEBI_TAG=.*/m, `WEBI_TAG='${tag}'`)
+              .replace(
+                /^\s*#?WEBI_PKG=.*/m,
+                "WEBI_PKG='" + pkg + '@' + ver + "'"
+              )
+              .replace(/^\s*#?WEBI_HOST=.*/m, "WEBI_HOST='" + baseurl + "'")
+              .replace(/^\s*#?WEBI_OS=.*/m, "WEBI_OS='" + (os || '') + "'")
+              .replace(
+                /^\s*#?WEBI_ARCH=.*/m,
+                "WEBI_ARCH='" + (arch || '') + "'"
+              )
+              .replace(/^\s*#?WEBI_TAG=.*/m, "WEBI_TAG='" + tag + "'")
               .replace(
                 /^\s*#?WEBI_RELEASES=.*/m,
                 "WEBI_RELEASES='" +
@@ -84,7 +81,7 @@ Releases.renderBash = async function (
                   '&formats=' +
                   formats.join(',') +
                   '&pretty=true' +
-                  "'",
+                  "'"
               )
               .replace(
                 /^\s*#?WEBI_CSV=.*/m,
@@ -100,15 +97,15 @@ Releases.renderBash = async function (
                     '-',
                     rel.download,
                     rel.name,
-                    rel.comment || '',
+                    rel.comment || ''
                   ]
                     .join(',')
                     .replace(/'/g, '') +
-                  "'",
+                  "'"
               )
               .replace(
                 /^\s*#?WEBI_VERSION=.*/m,
-                'WEBI_VERSION=' + JSON.stringify(rel.version),
+                'WEBI_VERSION=' + JSON.stringify(rel.version)
               )
               .replace(/^\s*#?WEBI_MAJOR=.*/m, 'WEBI_MAJOR=' + v.major)
               .replace(/^\s*#?WEBI_MINOR=.*/m, 'WEBI_MINOR=' + v.minor)
@@ -118,48 +115,44 @@ Releases.renderBash = async function (
               .replace(/^\s*#?WEBI_CHANNEL=.*/m, 'WEBI_CHANNEL=' + rel.channel)
               .replace(
                 /^\s*#?WEBI_EXT=.*/m,
-                'WEBI_EXT=' + rel.ext.replace(/tar.*/, 'tar'),
+                'WEBI_EXT=' + rel.ext.replace(/tar.*/, 'tar')
               )
               .replace(
                 /^\s*#?WEBI_FORMATS=.*/m,
-                "WEBI_FORMATS='" + formats.join(',') + "'",
+                "WEBI_FORMATS='" + formats.join(',') + "'"
               )
               .replace(
                 /^\s*#?WEBI_PKG_URL=.*/m,
-                "WEBI_PKG_URL='" + rel.download + "'",
+                "WEBI_PKG_URL='" + rel.download + "'"
               )
               .replace(
                 /^\s*#?WEBI_PKG_FILE=.*/m,
-                "WEBI_PKG_FILE='" + pkgFile + "'",
+                "WEBI_PKG_FILE='" + pkgFile + "'"
               )
               // PKG details
               .replace(/^\s*#?PKG_NAME=.*/m, "PKG_NAME='" + pkg + "'")
               .replace(
                 /^\s*#?PKG_OSES=.*/m,
-                "PKG_OSES='" + ((rel && rel.oses) || []).join(',') + "'",
+                "PKG_OSES='" + ((rel && rel.oses) || []).join(',') + "'"
               )
               .replace(
                 /^\s*#?PKG_ARCHES=.*/m,
-                "PKG_ARCHES='" + ((rel && rel.arches) || []).join(',') + "'",
+                "PKG_ARCHES='" + ((rel && rel.arches) || []).join(',') + "'"
               )
               .replace(
                 /^\s*#?PKG_FORMATS=.*/m,
-                "PKG_FORMATS='" + ((rel && rel.formats) || []).join(',') + "'",
+                "PKG_FORMATS='" + ((rel && rel.formats) || []).join(',') + "'"
               )
-              // $', $0, ... $9, $`, $&, and $_ all have special meaning
-              // (see https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RegExp)
-              // However, it can be escaped with $$ (which must be escaped with $$)
-
-              .replace(reInstallTpl, '\n' + installTxt.replace(/\$/g, '$$$$'))
+              .replace(reInstallTpl, '\n' + installTxt)
           );
         });
     });
 };
 
-Releases.renderBatch = async function (
+Releases.renderBatch = function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os, arch, formats },
+  { baseurl, pkg, tag, ver, os, arch, formats }
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -189,17 +182,17 @@ Releases.renderBatch = async function (
           return tplTxt
             .replace(
               /^(REM )?WEBI_PKG=.*/im,
-              "WEBI_PKG='" + pkg + '@' + ver + "'",
+              "WEBI_PKG='" + pkg + '@' + ver + "'"
             )
             .replace(reInstallTpl, '\n' + installTxt);
         });
     });
 };
 
-Releases.renderPowerShell = async function (
+Releases.renderPowerShell = function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os, arch, formats },
+  { baseurl, pkg, tag, ver, os, arch, formats }
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -230,27 +223,27 @@ Releases.renderPowerShell = async function (
           return tplTxt
             .replace(
               /^(#)?\$Env:WEBI_HOST\s*=.*/im,
-              "$Env:WEBI_HOST = '" + baseurl + "'",
+              "$Env:WEBI_HOST = '" + baseurl + "'"
             )
             .replace(
               /^(#)?\$Env:WEBI_PKG\s*=.*/im,
-              "$Env:WEBI_PKG = '" + pkgver + "'",
+              "$Env:WEBI_PKG = '" + pkgver + "'"
             )
             .replace(
               /^(#)?\$Env:PKG_NAME\s*=.*/im,
-              "$Env:PKG_NAME = '" + pkg + "'",
+              "$Env:PKG_NAME = '" + pkg + "'"
             )
             .replace(
               /^(#)?\$Env:WEBI_VERSION\s*=.*/im,
-              "$Env:WEBI_VERSION = '" + rel.version + "'",
+              "$Env:WEBI_VERSION = '" + rel.version + "'"
             )
             .replace(
               /^(#)?\$Env:WEBI_PKG_URL\s*=.*/im,
-              "$Env:WEBI_PKG_URL = '" + rel.download + "'",
+              "$Env:WEBI_PKG_URL = '" + rel.download + "'"
             )
             .replace(
               /^(#)?\$Env:WEBI_PKG_FILE\s*=.*/im,
-              "$Env:WEBI_PKG_FILE = '" + rel.name + "'",
+              "$Env:WEBI_PKG_FILE = '" + rel.name + "'"
             )
             .replace(reInstallTpl, '\n' + installTxt);
         });

_webi/serve-installer.js

@@ -1,89 +0,0 @@
-'use strict';
-
-var path = require('path');
-
-var uaDetect = require('./ua-detect.js');
-var packages = require('./packages.js');
-var Releases = require('./releases.js');
-
-// handlers caching and transformation, probably should be broken down
-var getReleases = require('./transform-releases.js');
-
-var installersDir = path.join(__dirname, '..');
-
-serveInstaller.serveInstaller = serveInstaller;
-module.exports = serveInstaller;
-async function serveInstaller(baseurl, ua, pkg, tag, ext, formats) {
-  // TODO put some of this in a middleware? or common function?
-
-  var ver = tag.replace(/^v/, '');
-  var lts;
-  var channel;
-
-  switch (ver) {
-    case 'latest':
-      ver = '';
-      channel = 'stable';
-      break;
-    case 'lts':
-      lts = true;
-      channel = 'stable';
-      ver = '';
-      break;
-    case 'stable':
-      channel = 'stable';
-      ver = '';
-      break;
-    case 'beta':
-      channel = 'beta';
-      ver = '';
-      break;
-    case 'dev':
-      channel = 'dev';
-      ver = '';
-      break;
-  }
-
-  // TODO maybe move package/version/lts/channel detection into getReleases
-  var myOs = uaDetect.os(ua);
-  var myArch = uaDetect.arch(ua);
-  var myLibc = uaDetect.libc(ua);
-  let cfg = await packages.get(pkg);
-  let rels = await getReleases({
-    pkg: cfg.alias || pkg,
-    ver,
-    os: myOs,
-    arch: myArch,
-    libc: myLibc,
-    lts,
-    channel,
-    formats,
-    limit: 1,
-  });
-
-  var rel = rels.releases[0];
-  var pkgdir = path.join(installersDir, pkg);
-  var opts = {
-    baseurl,
-    pkg: cfg.alias || pkg,
-    ver,
-    tag,
-    os: myOs,
-    arch: myArch,
-    lts,
-    channel,
-    formats,
-    limit: 1,
-  };
-  rel.oses = rels.oses;
-  rel.arches = rels.arches;
-  rel.formats = rels.formats;
-
-  if ('bat' === ext) {
-    return Releases.renderBatch(pkgdir, rel, opts);
-  }
-  if ('ps1' === ext) {
-    return Releases.renderPowerShell(pkgdir, rel, opts);
-  }
-  return Releases.renderBash(pkgdir, rel, opts);
-}

_webi/template.ps1

@@ -1,17 +1,4 @@
-#!/usr/bin/env pwsh
-#350 check if windows user run as admin
-
-function Confirm-IsElevated {
-    $id = [System.Security.Principal.WindowsIdentity]::GetCurrent()
-    $p = New-Object System.Security.Principal.WindowsPrincipal($id)
-    if ($p.IsInRole([System.Security.Principal.WindowsBuiltInRole]::Administrator))
-    { Write-Output $true }
-    else
-    { Write-Output $false }
-}
-
-if (Confirm-IsElevated)
-{ throw "Webi MUST NOT be run with elevated privileges. Please run again as a normal user, NOT as administrator." }
+#!/usr/bin/env pwsh
 
 # this allows us to call ps1 files, which allows us to have spaces in filenames
 # ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
@@ -32,90 +19,29 @@ $Env:WEBI_HOST = 'https://webinstall.dev'
 #$Env:WEBI_PKG_FILE = "node-v12.16.2-win-x64.zip"
 
 # Switch to userprofile
-Push-Location $Env:USERPROFILE
+pushd $Env:USERPROFILE
 
 # Make paths
-New-Item -Path Downloads -ItemType Directory -Force | Out-Null
-New-Item -Path .local\bin -ItemType Directory -Force | Out-Null
-New-Item -Path .local\opt -ItemType Directory -Force | Out-Null
+New-Item -Path Downloads -ItemType Directory -Force | out-null
+New-Item -Path .local\bin -ItemType Directory -Force | out-null
+New-Item -Path .local\opt -ItemType Directory -Force | out-null
 
 # {{ baseurl }}
 # {{ version }}
 
-function webi_path_add($pathname) {
-    # C:\Users\me => C:/Users/me
-    $my_home = $Env:UserProfile
-    $my_home = $my_home.replace('\\', '/')
-    $my_home_re = [regex]::escape($my_home)
-
-    # ~/bin => %USERPROFILE%/bin
-    $pathname = $pathname.replace('~/', "$Env:UserProfile/")
-
-    # C:\Users\me\bin => %USERPROFILE%/bin
-    $my_pathname = $pathname.replace('\\', '/')
-    $my_pathname = $my_pathname -ireplace $my_home_re, "%USERPROFILE%"
-
-    $all_user_paths = [Environment]::GetEnvironmentVariable("Path", "User")
-    $user_paths = $all_user_paths -Split (';')
-    $exists_in_path = $false
-    foreach ($user_path in $user_paths) {
-        # C:\Users\me\bin => %USERPROFILE%/bin
-        $my_user_path = $user_path.replace('\\', '/')
-        $my_user_path = $my_user_path -ireplace $my_home_re, "%USERPROFILE%"
-
-        if ($my_user_path -ieq $my_pathname) {
-            $exists_in_path = $true
-        }
-    }
-    if (-Not $exists_in_path) {
-        $all_user_paths = $pathname + ";" + $all_user_paths
-        [Environment]::SetEnvironmentVariable("Path", $all_user_paths, "User")
-    }
-
-    $session_paths = $Env:Path -Split (';')
-    $in_session_path = $false
-    foreach ($session_path in $session_paths) {
-        # C:\Users\me\bin => %USERPROFILE%/bin
-        $my_session_path = $session_path.replace('\\', '/')
-        $my_session_path = $my_session_path -ireplace $my_home_re, "%USERPROFILE%"
-
-        if ($my_session_path -ieq $my_pathname) {
-            $in_session_path = $true
-        }
-    }
-
-    if (-Not $in_session_path) {
-        $my_cmd = 'PATH ' + "$pathname" + ';%PATH%'
-        $my_pwsh = '$Env:Path = "' + "$pathname" + ';$Env:Path"'
-
-        Write-Host ''
-        Write-Host '**********************************' -ForegroundColor red -BackgroundColor white
-        Write-Host '*      IMPORTANT -- READ ME      *' -ForegroundColor red -BackgroundColor white
-        Write-Host '*  (run the PATH command below)  *' -ForegroundColor red -BackgroundColor white
-        Write-Host '**********************************' -ForegroundColor red -BackgroundColor white
-        Write-Host ''
-        Write-Output ""
-        Write-Output "Copy, paste, and run the appropriate command to update your PATH:"
-        Write-Output "(or close and reopen the terminal, or reboot)"
-        Write-Output ""
-        Write-Output "cmd.exe:"
-        Write-Output "    $my_cmd"
-        Write-Output ""
-        Write-Output "PowerShell:"
-        Write-Output "    $my_pwsh"
-        Write-Output ""
-    }
+function webi_add_path
+{
+    & "$Env:USERPROFILE\.local\bin\pathman.exe" add "$args[0]"
+    # Note: not all of these work as expected, so we use the unix-style, which is most consistent
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add "$Env:USERPROFILE\.local\bin"
+    #& "$Env:USERPROFILE\.local\bin\pathman.exe" add %USERPROFILE%\.local\bin
 }
 
-#$has_local_bin = echo "$Env:PATH" | Select-String -Pattern '\.local.bin'
-#if (!$has_local_bin)
-#{
-webi_path_add ~/.local/bin
-#}
+# Run pathman to set up the folder
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
 
-# {{ installer }}
-
-webi_path_add ~/.local/bin
+{{ installer }}
 
 # Done
-Pop-Location
+popd

_webi/template.sh

@@ -1,16 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
-__bootstrap_webi() {
+# shellcheck disable=2001
+# because I prefer to use sed rather than bash replace
+# (there's too little space in my head to learn both syntaxes)
+
+function __bootstrap_webi() {
 
     set -e
     set -u
     #set -x
 
-    my_libc=''
-    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
-        my_libc=' musl-native'
-    fi
-
     #WEBI_PKG=
     #PKG_NAME=
     # TODO should this be BASEURL instead?
@@ -35,28 +34,17 @@ __bootstrap_webi() {
     #PKG_OSES=
     #PKG_ARCHES=
     #PKG_FORMATS=
-    WEBI_UA="$(uname -s)/$(uname -r) $(uname -m)/unknown${my_libc}"
-    WEBI_PKG_DOWNLOAD=""
-    WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
-    if command -v xdg-user-dir > /dev/null; then
-        WEBI_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)"
-        if [ "${WEBI_DOWNLOAD_DIR}" = "${HOME}" ]; then
-            WEBI_DOWNLOAD_DIR="${HOME}/Downloads"
-        fi
-    fi
-
-    WEBI_PKG_PATH="${WEBI_DOWNLOAD_DIR}/webi/${PKG_NAME:-error}/${WEBI_VERSION:-latest}"
-
+    WEBI_UA="$(uname -a)"
     export WEBI_HOST
 
     ##
     ## Set up tmp, download, and install directories
     ##
 
-    WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-"${WEBI_PKG-}".XXXXXXXX)"}
+    WEBI_TMP=${WEBI_TMP:-"$(mktemp -d -t webinstall-"${WEBI_PKG:-}".XXXXXXXX)"}
     export _webi_tmp="${_webi_tmp:-"$HOME/.local/opt/webi-tmp.d"}"
 
-    mkdir -p "${WEBI_PKG_PATH}"
+    mkdir -p "$HOME/Downloads"
     mkdir -p "$HOME/.local/bin"
     mkdir -p "$HOME/.local/opt"
 
@@ -79,9 +67,9 @@ __bootstrap_webi() {
         fi
 
         if [ -n "$(command -v pkg_format_cmd_version)" ]; then
-            my_versioned_name="'$(pkg_format_cmd_version "$WEBI_VERSION")'"
+            my_versioned_name="$(pkg_format_cmd_version "$WEBI_VERSION")"
         else
-            my_versioned_name="'$pkg_cmd_name v$WEBI_VERSION'"
+            my_versioned_name="'$pkg_cmd_name' v$WEBI_VERSION"
         fi
 
         echo "$my_versioned_name"
@@ -96,7 +84,7 @@ __bootstrap_webi() {
             return 0
         fi
 
-        if [ -n "$WEBI_SINGLE" ] || [ "single" = "${1-}" ]; then
+        if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
             rm -rf "$pkg_dst_cmd"
             ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
         else
@@ -117,95 +105,59 @@ __bootstrap_webi() {
         my_current_cmd="$(command -v "$pkg_cmd_name")"
         set -e
         if [ -n "$my_current_cmd" ]; then
+            pkg_current_version="$(pkg_get_current_version 2> /dev/null | head -n 1)"
+            # remove trailing '.0's for golang's sake
+            my_current_version="$(echo "$pkg_current_version" | sed 's:\.0::g')"
+            my_src_version="$(echo "$WEBI_VERSION" | sed 's:\.0::g')"
             my_canonical_name="$(_webi_canonical_name)"
-            if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
-                echo >&2 "WARN: possible PATH conflict between $my_canonical_name and currently installed version"
-                echo >&2 "    ${pkg_dst_cmd} (new)"
-                echo >&2 "    ${my_current_cmd} (existing)"
-                #my_current_version=false
-            fi
-            # 'readlink' can't read links in paths on macOS 🤦
-            # but that's okay, 'cmp -s' is good enough for us
-            if cmp -s "${pkg_src_cmd}" "${my_current_cmd}"; then
-                echo "${my_canonical_name} already installed:"
-                printf "    %s" "${pkg_dst}"
-                if [ "${pkg_src_cmd}" != "${my_current_cmd}" ]; then
-                    printf " => %s" "${pkg_src}"
+            if [ "$my_src_version" == "$my_current_version" ]; then
+                echo "$my_canonical_name already installed at $my_current_cmd"
+                exit 0
+            else
+                if [ "$my_current_cmd" != "$pkg_dst_cmd" ]; then
+                    echo >&2 "WARN: possible conflict between $my_canonical_name and $pkg_current_version at $my_current_cmd"
+                fi
+                if [ -x "$pkg_src_cmd" ]; then
+                    # shellcheck disable=2119
+                    # this function takes no args
+                    webi_link
+                    echo "switched to $my_canonical_name at $pkg_src"
+                    exit 0
                 fi
-                echo ""
-                exit 0
-            fi
-            if [ -x "$pkg_src_cmd" ]; then
-                # shellcheck disable=2119
-                # this function takes no args
-                webi_link
-                echo "switched to $my_canonical_name:"
-                echo "    ${pkg_dst} => ${pkg_src}"
-                exit 0
             fi
         fi
         export PATH="$my_path"
     }
 
-    is_interactive_shell() {
-        # $- shows shell flags (error,unset,interactive,etc)
-        case $- in
-            *i*)
-                # true
-                return 0
-                ;;
-            *)
-                # false
-                return 1
-                ;;
-        esac
-    }
-
     # detect if file is downloaded, and how to download it
     webi_download() {
-        # determine the url to download
-        if [ -n "${1-}" ]; then
-            my_url="${1}"
+        if [ -n "${1:-}" ]; then
+            my_url="$1"
         else
-            if [ "error" = "$WEBI_CHANNEL" ]; then
+            if [ "error" == "$WEBI_CHANNEL" ]; then
                 # TODO pass back requested OS / Arch / Version
-                echo >&2 "Error: no '$PKG_NAME' release for '${WEBI_OS-}' on '$WEBI_ARCH' as one of '$WEBI_FORMATS' by the tag '${WEBI_TAG-}'"
+                echo >&2 "Error: no '$PKG_NAME' release for '${WEBI_OS:-}' on '$WEBI_ARCH' as one of '$WEBI_FORMATS' by the tag '${WEBI_TAG:-}'"
                 echo >&2 "       '$PKG_NAME' is available for '$PKG_OSES' on '$PKG_ARCHES' as one of '$PKG_FORMATS'"
                 echo >&2 "       (check that the package name and version are correct)"
                 echo >&2 ""
-                my_release_url="$(
-                    echo "$WEBI_RELEASES" |
-                        sed 's:\?.*::'
-                )"
-                echo >&2 "       Double check at ${my_release_url}"
+                echo >&2 "       Double check at $(echo "$WEBI_RELEASES" | sed 's:\?.*::')"
                 echo >&2 ""
                 exit 1
             fi
             my_url="$WEBI_PKG_URL"
         fi
-
-        # determine the location to download to
-        if [ -n "${2-}" ]; then
-            my_dl="${2}"
+        if [ -n "${2:-}" ]; then
+            my_dl="$2"
         else
-            my_dl="${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
+            my_dl="$HOME/Downloads/$WEBI_PKG_FILE"
         fi
 
-        if [ -n "${3-}" ]; then
-            my_dl_name="${3}"
-        else
-            my_dl_name="${PKG_NAME}"
-        fi
-
-        WEBI_PKG_DOWNLOAD="${my_dl}"
-        export WEBI_PKG_DOWNLOAD
-
         if [ -e "$my_dl" ]; then
             echo "Found $my_dl"
             return 0
         fi
 
-        echo "Downloading ${my_dl_name} from"
+        echo "Downloading $PKG_NAME from"
         echo "$my_url"
 
         # It's only 2020, we can't expect to have reliable CLI tools
@@ -215,7 +167,7 @@ __bootstrap_webi() {
             # TODO wget -c --content-disposition "$my_url"
             set +e
             my_show_progress=""
-            if is_interactive_shell; then
+            if [[ $- == *i* ]]; then
                 my_show_progress="--show-progress"
             fi
             if ! wget -q $my_show_progress --user-agent="wget $WEBI_UA" -c "$my_url" -O "$my_dl.part"; then
@@ -227,7 +179,7 @@ __bootstrap_webi() {
             # Neither GNU nor BSD curl have sane resume download options, hence we don't bother
             # TODO curl -fsSL --remote-name --remote-header-name --write-out "$my_url"
             my_show_progress="-#"
-            if is_interactive_shell; then
+            if [[ $- == *i* ]]; then
                 my_show_progress=""
             fi
             # shellcheck disable=SC2086
@@ -242,203 +194,44 @@ __bootstrap_webi() {
 
     # detect which archives can be used
     webi_extract() {
-        (
-            cd "$WEBI_TMP"
-            if [ "tar" = "$WEBI_EXT" ]; then
-                echo "Extracting ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-                tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-            elif [ "zip" = "$WEBI_EXT" ]; then
-                echo "Extracting ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-                unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
-            elif [ "exe" = "$WEBI_EXT" ]; then
-                echo "Moving ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-                mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-            elif [ "xz" = "$WEBI_EXT" ]; then
-                echo "Inflating ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-                unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
-            else
-                # do nothing
-                echo "Failed to extract ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-                exit 1
-            fi
-        )
+        pushd "$WEBI_TMP" > /dev/null 2>&1
+        if [ "tar" == "$WEBI_EXT" ]; then
+            echo "Extracting $HOME/Downloads/$WEBI_PKG_FILE"
+            tar xf "$HOME/Downloads/$WEBI_PKG_FILE"
+        elif [ "zip" == "$WEBI_EXT" ]; then
+            echo "Extracting $HOME/Downloads/$WEBI_PKG_FILE"
+            unzip "$HOME/Downloads/$WEBI_PKG_FILE" > __unzip__.log
+        elif [ "exe" == "$WEBI_EXT" ]; then
+            echo "Moving $HOME/Downloads/$WEBI_PKG_FILE"
+            mv "$HOME/Downloads/$WEBI_PKG_FILE" .
+        elif [ "xz" == "$WEBI_EXT" ]; then
+            echo "Inflating $HOME/Downloads/$WEBI_PKG_FILE"
+            unxz -c "$HOME/Downloads/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
+        else
+            # do nothing
+            echo "Failed to extract $HOME/Downloads/$WEBI_PKG_FILE"
+            exit 1
+        fi
+        popd > /dev/null 2>&1
     }
 
     # use 'pathman' to update $HOME/.config/envman/PATH.env
     webi_path_add() {
-        my_path="${1}"
+        # make sure that we don't recursively install pathman with webi
+        my_path="$PATH"
+        export PATH="$HOME/.local/bin:$PATH"
 
-        fn_envman_init
-
-        # \v was chosen as it is extremely unlikely for a filename
-        # \1 could be an even better choice, but needs more testing.
-        # (currently tested working on: linux & mac)
-        # "\0001" should also work
-        my_delim="$(
-            printf '\v'
-        )"
-
-        my_path_expanded="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}\$HOME${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
-        )"
-
-        # A gift for @adamcstephens.
-        # See https://github.com/webinstall/webi-installers/issues/322
-        case "${PATH}" in
-            # matches whether the first, a middle, the last, or the only PATH entry
-            "${my_path_expanded}":* | \
-                *:"${my_path_expanded}":* | \
-                *:"${my_path_expanded}" | \
-                "${my_path_expanded}")
-
-                if fn_is_defined_in_all_shells "${my_path}"; then
-                    return 0
-                fi
-                ;;
-            *) ;;
-        esac
-
-        my_path_export="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}\$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}\$HOME/${my_delim}g"
-        )"
-
-        my_export="export PATH=\"$my_path_export:\$PATH\""
-        if grep -q -F "${my_export}" ~/.config/envman/PATH.env; then
-            return 0
+        # install pathman if not already installed
+        if [ -z "$(command -v pathman)" ]; then
+            "$HOME/.local/bin/webi" pathman > /dev/null
         fi
 
-        echo "${my_export}" >> ~/.config/envman/PATH.env
+        export PATH="$my_path"
 
+        # in case pathman was recently installed and the PATH not updated
         mkdir -p "$_webi_tmp"
-        my_path_tilde="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}${HOME}${my_delim}~${my_delim}g"
-        )"
-
-        if ! test -f "$_webi_tmp/.PATH.env" ||
-            ! grep -q -F "${my_path_tilde}" "$_webi_tmp/.PATH.env"; then
-            echo "${my_path_tilde}" >> "$_webi_tmp/.PATH.env"
-        fi
-    }
-
-    fn_envman_init() {
-        mkdir -p ~/.config/envman/
-        if ! test -e ~/.config/envman/PATH.env; then
-            touch ~/.config/envman/PATH.env
-        fi
-
-        if ! test -e ~/.config/envman/load.sh; then
-            # shellcheck disable=SC2016
-            {
-                echo '# Generated for envman. Do not edit.'
-                echo 'for x in ~/.config/envman/*.env; do'
-                echo '    my_basename="$(basename "${x}")"'
-                echo '    if [ "*.env" = "${my_basename}" ]; then'
-                echo '        continue'
-                echo '    fi'
-                echo ''
-                echo '    # shellcheck source=/dev/null'
-                echo '    . "${x}"'
-                echo 'done'
-            } > ~/.config/envman/load.sh
-        fi
-
-        if command -v sh > /dev/null; then
-            if test -e ~/.profile; then
-                if ! grep -q -F '/.config/envman/load.sh' ~/.profile; then
-                    fn_echo_load_sh >> ~/.profile
-                fi
-            fi
-        fi
-        if command -v bash > /dev/null; then
-            if test -e ~/.bashrc; then
-                if ! grep -q -F '/.config/envman/load.sh' ~/.bashrc; then
-                    fn_echo_load_sh >> ~/.bashrc
-                fi
-            fi
-        fi
-        if command -v zsh > /dev/null; then
-            if test -e ~/.zshrc; then
-                if ! grep -q -F '/.config/envman/load.sh' ~/.zshrc; then
-                    fn_echo_load_sh >> ~/.zshrc
-                fi
-            fi
-        fi
-
-        if command -v fish > /dev/null; then
-            if test ! -e ~/.config/envman/load.fish; then
-                # shellcheck disable=SC2016
-                {
-                    echo '# Generated for envman. Do not edit.'
-                    echo 'for x in ~/.config/envman/*.env'
-                    echo '	  source "$x"'
-                    echo 'end'
-                } > ~/.config/envman/load.fish
-            fi
-
-            mkdir -p ~/.config/fish
-            if test -e ~/.config/fish/config.fish; then
-                touch ~/.config/fish/config.fish
-            fi
-            if ! grep -q -F '/.config/envman/load.fish' ~/.config/fish/config.fish; then
-                fn_echo_load_fish >> ~/.config/fish/config.fish
-            fi
-        fi
-    }
-
-    fn_echo_load_fish() {
-        echo ''
-        echo '# Generated for envman. Do not edit.'
-        # shellcheck disable=SC2016
-        echo 'test -s "$HOME/.config/envman/load.fish"; and source "$HOME/.config/envman/load.fish"'
-    }
-
-    fn_echo_load_sh() {
-        echo ''
-        echo '# Generated for envman. Do not edit.'
-        # shellcheck disable=SC2016
-        echo '[ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"'
-    }
-
-    fn_is_defined_in_all_shells() {
-        my_path="${1}"
-
-        my_path_expanded="$(
-            echo "${my_path}" |
-                sed -e "s${my_delim}\$HOME|${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}\${HOME}${my_delim}$HOME${my_delim}g" \
-                    -e "s${my_delim}^~/${my_delim}$HOME/${my_delim}g"
-        )"
-        my_paths="$(
-            echo "${my_path_expanded}"
-            # $HOME/foo
-            echo "${my_path_expanded}" |
-                sed "s${my_delim}${HOME}${my_delim}\$HOME${my_delim}g"
-            # ${HOME}/foo
-            echo "${my_path_expanded}" |
-                sed "s${my_delim}${HOME}${my_delim}\${HOME}${my_delim}g"
-            echo "${my_path}"
-        )"
-
-        my_confs="$(
-            echo "${HOME}/.profile"
-            echo "${HOME}/.bashrc"
-            echo "${HOME}/.zshrc"
-            echo "${HOME}/.config/fish/config.fish"
-        )"
-        for my_conf in $my_confs; do
-            if test -e "${my_conf}"; then
-                if ! grep -q -F "${my_paths}" "${my_conf}"; then
-                    return 1
-                fi
-            fi
-        done
+        # prevent "too few arguments" output on bash when there are 0 lines of stdout
+        "$HOME/.local/bin/pathman" add "$1" | grep "export" 2> /dev/null >> "$_webi_tmp/.PATH.env" || true
     }
 
     # group common pre-install tasks as default
@@ -452,7 +245,7 @@ __bootstrap_webi() {
     # shellcheck disable=2120
     # webi_install may be sourced and used elsewhere
     webi_install() {
-        if [ -n "$WEBI_SINGLE" ] || [ "single" = "${1-}" ]; then
+        if [ -n "$WEBI_SINGLE" ] || [ "single" == "${1:-}" ]; then
             mkdir -p "$(dirname "$pkg_src_cmd")"
             mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
         else
@@ -506,21 +299,18 @@ __bootstrap_webi() {
 
     WEBI_SINGLE=
 
-    if [ -z "${WEBI_WELCOME-}" ]; then
+    if [[ -z ${WEBI_WELCOME:-} ]]; then
         echo ""
-        printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s/%s\e[0m'.\n" "${WEBI_PKG-}" "$(uname -s)" "$(uname -m)"
+        echo "Thanks for using webi to install '$PKG_NAME' on '$WEBI_OS/$WEBI_ARCH'."
         echo "Have a problem? Experience a bug? Please let us know:"
-        printf "        \e[2m\e[36mhttps://github.com/webinstall/webi-installers/issues\e[0m\n"
-        echo ""
-        printf "\e[35mLovin'\e[0m it? Say thanks with a \e[1m\e[33mStar on GitHub\e[0m:\n"
-        printf "        \e[36mhttps://github.com/webinstall/webi-installers\e[0m\n"
+        echo "        https://github.com/webinstall/packages/issues"
         echo ""
     fi
 
-    __init_installer() {
+    function __init_installer() {
 
         # do nothing - to satisfy parser prior to templating
-        printf ""
+        echo -n ""
 
         # {{ installer }}
 
@@ -535,20 +325,7 @@ __bootstrap_webi() {
     ##
 
     # run everything with defaults or overrides as needed
-    if command -v pkg_install > /dev/null ||
-        command -v pkg_link > /dev/null ||
-        command -v pkg_post_install > /dev/null ||
-        command -v pkg_done_message > /dev/null ||
-        command -v pkg_format_cmd_version > /dev/null ||
-        [ -n "${WEBI_SINGLE-}" ] ||
-        [ -n "${pkg_cmd_name-}" ] ||
-        [ -n "${pkg_dst_cmd-}" ] ||
-        [ -n "${pkg_dst_dir-}" ] ||
-        [ -n "${pkg_dst-}" ] ||
-        [ -n "${pkg_src_cmd-}" ] ||
-        [ -n "${pkg_src_dir-}" ] ||
-        [ -n "${pkg_src-}" ]; then
-
+    if [ -n "$(command -v pkg_get_current_version)" ]; then
         pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
 
         if [ -n "$WEBI_SINGLE" ]; then
@@ -571,47 +348,36 @@ __bootstrap_webi() {
         # shellcheck disable=SC2034
         pkg_dst_bin="$(dirname "$pkg_dst_cmd")"
 
-        if [ -n "$(command -v pkg_pre_install)" ]; then pkg_pre_install; else webi_pre_install; fi
+        if [[ -n "$(command -v pkg_pre_install)" ]]; then pkg_pre_install; else webi_pre_install; fi
 
-        (
-            cd "$WEBI_TMP"
-            echo "Installing to $pkg_src_cmd"
-            if [ -n "$(command -v pkg_install)" ]; then pkg_install; else webi_install; fi
-            chmod a+x "$pkg_src"
-            chmod a+x "$pkg_src_cmd"
-        )
+        pushd "$WEBI_TMP" > /dev/null 2>&1
+        echo "Installing to $pkg_src_cmd"
+        if [[ -n "$(command -v pkg_install)" ]]; then pkg_install; else webi_install; fi
+        chmod a+x "$pkg_src"
+        chmod a+x "$pkg_src_cmd"
+        popd > /dev/null 2>&1
 
         webi_link
 
         _webi_enable_exec
-        (
-            cd "$WEBI_TMP"
-            if [ -n "$(command -v pkg_post_install)" ]; then pkg_post_install; else webi_post_install; fi
-        )
+        pushd "$WEBI_TMP" > /dev/null 2>&1
+        if [[ -n "$(command -v pkg_post_install)" ]]; then pkg_post_install; else webi_post_install; fi
+        popd > /dev/null 2>&1
 
-        (
-            cd "$WEBI_TMP"
-            if [ -n "$(command -v pkg_done_message)" ]; then pkg_done_message; else _webi_done_message; fi
-        )
+        pushd "$WEBI_TMP" > /dev/null 2>&1
+        if [[ -n "$(command -v pkg_done_message)" ]]; then pkg_done_message; else _webi_done_message; fi
+        popd > /dev/null 2>&1
 
         echo ""
     fi
 
     webi_path_add "$HOME/.local/bin"
-    if [ -z "${_WEBI_CHILD-}" ] && [ -f "$_webi_tmp/.PATH.env" ]; then
-        if [ -n "$(cat "$_webi_tmp/.PATH.env")" ]; then
-            printf 'PATH.env updated with:\n'
-            sort -u "$_webi_tmp/.PATH.env" | while read -r my_new_path; do
-                echo "        ${my_new_path}"
-            done
-            printf "\n"
-
+    if [[ -z ${_WEBI_CHILD:-} ]] && [[ -f "$_webi_tmp/.PATH.env" ]]; then
+        if [[ -n $(cat "$_webi_tmp/.PATH.env") ]]; then
+            echo "You need to update your PATH to use $PKG_NAME:"
+            echo ""
+            sort -u "$_webi_tmp/.PATH.env"
             rm -f "$_webi_tmp/.PATH.env"
-
-            printf "\e[1m\e[35mTO FINISH\e[0m: copy, paste & run the following command:\n"
-            printf "\n"
-            printf "        \e[1m\e[32msource ~/.config/envman/PATH.env\e[0m\n"
-            printf "        (newly opened terminal windows will update automatically)\n"
         fi
     fi
 

_webi/test.js

@@ -5,7 +5,7 @@
 //
 var usage = [
   'Usage: node _webi/test.js --debug <path-to-package>',
-  'Example: node _webi/test.js --debug ./node/',
+  'Example: node _webi/test.js --debug ./node/'
 ].join('\n');
 
 var count = 3;
@@ -104,7 +104,7 @@ Releases.get(path.join(process.cwd(), pkgdir)).then(function (all) {
       ver: '',
       os: osrel,
       arch,
-      formats: formats,
+      formats: formats
     }).catch(function () {}),
     Releases.renderPowerShell(pkgdir, rel, {
       baseurl: 'https://webinstall.dev',
@@ -113,8 +113,8 @@ Releases.get(path.join(process.cwd(), pkgdir)).then(function (all) {
       ver: '',
       os: osrel,
       arch,
-      formats: formats,
-    }).catch(function () {}),
+      formats: formats
+    }).catch(function () {})
   ]).then(function (scripts) {
     var bashTxt = scripts[0];
     var ps1Txt = scripts[1];
@@ -125,13 +125,13 @@ Releases.get(path.join(process.cwd(), pkgdir)).then(function (all) {
       bashTxt = (bashTxt || 'echo ERROR').replace(/#set -x/g, 'set -x');
       ps1Txt = (ps1Txt || 'echo ERROR').replace(
         /REM REM todo debug/g,
-        'REM todo debug',
+        'REM todo debug'
       );
     }
     console.info('Do the scripts actually work?');
     if (bashFile && bashTxt) {
       fs.writeFileSync(bashFile, bashTxt, 'utf-8');
-      console.info('\tNEEDS MANUAL TEST: sh %s', bashFile);
+      console.info('\tNEEDS MANUAL TEST: bash %s', bashFile);
     }
     if (ps1File && ps1Txt) {
       fs.writeFileSync(ps1File, ps1Txt, 'utf-8');

_webi/transform-releases.js

@@ -1,399 +0,0 @@
-'use strict';
-
-var path = require('path');
-var Releases = require('./releases.js');
-var uaDetect = require('./ua-detect.js');
-
-var cache = {};
-//var staleAge = 5 * 1000;
-//var expiredAge = 15 * 1000;
-var staleAge = 5 * 60 * 1000;
-var expiredAge = 15 * 60 * 1000;
-
-let installerDir = path.join(__dirname, '..');
-
-// TODO needs a proper test, and more accurate (though perhaps far less simple) code
-function createFormatsSorter(formats) {
-  return function sortByVerExt(a, b) {
-    function lexver(semver) {
-      // v1.20.156 => 00001.00020.00156.zzzzz
-      // TODO BUG: v1.20.156-rc2 => 00001.00020.00156.rc2zz
-      var parts = semver.split(/[+\.\-]/g);
-      while (parts.length < 4) {
-        parts.push('');
-      }
-      return parts
-        .map(function (num, i) {
-          if (3 === i) {
-            return num.toString().padEnd(10, 'z');
-          }
-          return num.toString().padStart(10, '0');
-        })
-        .join('.');
-    }
-
-    var aver = lexver(a.version);
-    var bver = lexver(b.version);
-    if (aver > bver) {
-      //console.log(aver, '>', bver);
-      return -1;
-    }
-    if (aver < bver) {
-      //console.log(aver, '<', bver);
-      return 1;
-    }
-
-    var aExtPri = formats.indexOf(a.ext.replace(/tar\..*/, 'tar'));
-    var bExtPri = formats.indexOf(b.ext.replace(/tar\..*/, 'tar'));
-    if (aExtPri > bExtPri) {
-      //console.log(a.ext, aExtPri, '>', b.ext, bExtPri);
-      return -1;
-    }
-    if (aExtPri < bExtPri) {
-      //console.log(a.ext, aExtPri, '<', b.ext, bExtPri);
-      return 1;
-    }
-
-    // Hacky-doo for musl-native: prefer non-musl
-    if (a._musl_native && !b._musl_native) {
-      return 1;
-    }
-    if (!a._musl_native && b._musl_native) {
-      return -1;
-    }
-
-    // Hacky-doo for linux: prefer musl
-    if (a._musl && !b._musl) {
-      return -1;
-    }
-    if (!a._musl && b._musl) {
-      return 1;
-    }
-    return 0;
-  };
-}
-
-async function getCachedReleases(pkg) {
-  // returns { download: '<template string>', releases: [{ version, date, os, arch, lts, channel, download}] }
-
-  async function chainCachePromise(fn) {
-    cache[pkg].promise = cache[pkg].promise.then(fn);
-    return cache[pkg].promise;
-  }
-
-  async function sleep(ms) {
-    return await new Promise(function (resolve, reject) {
-      setTimeout(resolve, ms);
-    });
-  }
-
-  async function putCache() {
-    var age = Date.now() - cache[pkg].updatedAt;
-    if (age < staleAge) {
-      //console.debug('NOT STALE ANYMORE - updated in previous promise');
-      return cache[pkg].all;
-    }
-
-    //console.debug('DOWNLOADING NEW "%s" releases', pkg);
-    var pkgdir = path.join(installerDir, pkg);
-
-    // workaround for request timeout seeming to not work
-    let complete = false;
-    await Promise.race([
-      Releases.get(pkgdir)
-        .catch(function (err) {
-          if ('E_NO_RELEASE' === err.code) {
-            let all = { _error: 'E_NO_RELEASE', download: '', releases: [] };
-            return all;
-          }
-
-          throw err;
-        })
-        .catch(function (err) {
-          let hasReleases = cache[pkg].all?.releases?.length > 1;
-          if (!hasReleases) {
-            throw err;
-          }
-
-          console.error(`Error: the BOOGEYMAN got us!`);
-          console.error(err.stack);
-
-          return cache[pkg].all;
-        })
-        .then(function (all) {
-          // Note: it is possible for slightly older data
-          // to replace slightly newer data, but this is better
-          // than being in a cycle where release updates _always_
-          // take longer than expected.
-          //console.debug('DOWNLOADED NEW "%s" releases', pkg);
-          cache[pkg].updatedAt = Date.now();
-          cache[pkg].all = all;
-          complete = true;
-        }),
-      sleep(5000).then(function () {
-        if (complete) {
-          return;
-        }
-        console.error(`request timeout waiting for '${pkg}' release info`);
-      }),
-    ]);
-
-    return cache[pkg].all;
-  }
-
-  if (!cache[pkg]) {
-    cache[pkg] = {
-      updatedAt: 0,
-      all: { download: '', releases: [] },
-      promise: Promise.resolve(),
-    };
-  }
-
-  var bgRenewal;
-  var age = Date.now() - cache[pkg].updatedAt;
-  var fresh = age < staleAge;
-  if (!fresh) {
-    bgRenewal = chainCachePromise(putCache);
-  }
-
-  var tooStale = age > expiredAge;
-  if (!tooStale) {
-    return await cache[pkg].all;
-  }
-
-  return await Promise.race([
-    bgRenewal,
-    sleep(5000).then(function () {
-      return cache[pkg].all;
-    }),
-  ]);
-}
-
-async function filterReleases(
-  all,
-  { ver, os, arch, libc, lts, channel, formats, limit },
-) {
-  // When multiple formats are downloadable (i.e. .zip and .pkg)
-  // sort the most compatible format first
-  // (i.e. so that we don't do .pkg on linux except on purpose)
-  var rformats = formats.slice(0).reverse();
-  var sortByVerExt = createFormatsSorter(rformats);
-  var reVer = new RegExp('^' + ver + '\\b');
-
-  function selectMatches(rel) {
-    if (os) {
-      if (rel.os !== os) {
-        return false;
-      }
-    }
-
-    if (arch) {
-      if (rel.arch !== arch) {
-        return false;
-      }
-    }
-
-    // Hacky-doo for linux musl
-    if (libc === uaDetect.MUSL_NATIVE) {
-      if (!rel._musl && !rel._musl_native) {
-        return false;
-      }
-    } else if (rel._musl_native) {
-      return false;
-    }
-
-    if (lts) {
-      if (!rel.lts) {
-        return false;
-      }
-    }
-
-    if (channel) {
-      if (rel.channel !== channel) {
-        return false;
-      }
-    }
-
-    // to match 'tar.gz' and 'tar.xz' with just 'tar'
-    function hasExt(ext) {
-      return rel.ext.match(ext);
-    }
-    if (formats.length) {
-      if (!formats.some(hasExt)) {
-        return false;
-      }
-    }
-
-    if (ver) {
-      if (!rel.version.match(reVer)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  var sortedRels = all.releases.filter(selectMatches).sort(sortByVerExt);
-  //console.log(sortedRels.slice(0, 4));
-
-  return sortedRels.slice(0, limit || 1000);
-}
-
-module.exports = function getReleases({
-  _count,
-  pkg,
-  ver,
-  os,
-  arch,
-  libc,
-  lts,
-  channel,
-  formats,
-  limit,
-}) {
-  if (!_count) {
-    _count = 0;
-  }
-  return getCachedReleases(pkg).then(function (all) {
-    return filterReleases(all, {
-      ver,
-      os,
-      arch,
-      libc,
-      lts,
-      channel,
-      formats,
-      limit,
-    })
-      .catch(function (err) {
-        if ('MODULE_NOT_FOUND' === err.code) {
-          return null;
-        }
-        console.error(
-          'TODO: lib/release.js: check type of error, such as MODULE_NOT_FOUND',
-        );
-        console.error(err);
-      })
-      .then(function (releases) {
-        if (!releases.length) {
-          // Apple Silicon M1 hacky-do workaround fix
-          if ('macos' === os && 'arm64' === arch) {
-            return getReleases({
-              pkg,
-              ver,
-              os,
-              arch: 'amd64',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          // Windows ARM hacky-do workaround fix
-          if ('windows' === os && 'arm64' === arch) {
-            return getReleases({
-              pkg,
-              ver,
-              os,
-              arch: 'amd64',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          // Raspberry Pi 3+ on Raspbian x86 (not Ubuntu arm64)
-          if (!_count && 'linux' === os && 'armv7l' === arch) {
-            return getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'arm64',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          // Raspberry Pi 3+ on Ubuntu arm64 (via Bionic?)
-          // (this may be the same as the prior search, that's okay)
-          if ('linux' === os && 'arm64' === arch) {
-            return getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'armv7l',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          // Raspberry Pi 3+ on Ubuntu arm64 (via Bionic?)
-          if ('linux' === os && 'armv7l' === arch) {
-            return getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'armv6l',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          releases = [
-            {
-              name: 'doesntexist.ext',
-              version: '0.0.0',
-              lts: '-',
-              channel: 'error',
-              date: '1970-01-01',
-              os: os || '-',
-              arch: arch || '-',
-              _musl: undefined,
-              _musl_native: undefined,
-              ext: 'err',
-              download: 'https://example.com/doesntexist.ext',
-              comment:
-                'No matches found. Could be bad or missing version info' +
-                ',' +
-                "Check query parameters. Should be something like '/api/releases/{package}@{version}.tab?os={macos|linux|windows|-}&arch={amd64|x86|aarch64|arm64|armv7l|-}&limit=100'",
-            },
-          ];
-        }
-        return {
-          oses: all.oses,
-          arches: all.arches,
-          formats: all.formats,
-          releases: releases,
-        };
-      });
-  });
-};
-
-if (require.main === module) {
-  return module
-    .exports({
-      pkg: 'node',
-      ver: '',
-      os: 'macos',
-      arch: 'amd64',
-      lts: true,
-      libc: '',
-      channel: 'stable',
-      formats: ['tar', 'exe', 'zip', 'xz', 'dmg', 'pkg'],
-      limit: 10,
-    })
-    .then(function (all) {
-      console.info(JSON.stringify(all));
-    });
-}

_webi/ua-detect.js

@@ -1,11 +1,5 @@
 'use strict';
 
-var uaDetect = module.exports;
-
-const MUSL_NATIVE = 'musl-native';
-
-uaDetect.MUSL_NATIVE = MUSL_NATIVE;
-
 function getRequest(req) {
   var ua = req.headers['user-agent'] || '';
   var os = req.query.os;
@@ -20,11 +14,11 @@ function getRequest(req) {
   }
 
   return {
-    unix: 'curl -fsSA "$(uname -srm)" ' + url,
+    unix: 'curl -fsSA "$(uname -a)" ' + url,
     windows: 'curl.exe -fsSA "MS $Env:PROCESSOR_ARCHITECTURE" ' + url,
     ua: ua,
     os: uaDetect.os(ua),
-    arch: uaDetect.arch(ua),
+    arch: uaDetect.arch(ua)
   };
 }
 
@@ -60,23 +54,16 @@ function getArch(ua) {
     return '-';
   }
 
-  // Quick hack for Apple Silicon M1
-  //
-  // Note: we now use `uname -srm` which does not have the native arch
-  // info included with `uname -v` and `uname -a`.
-  //
+  // quick hack for Apple Silicon M1
   // Native:  Darwin boomer.local 20.2.0 Darwin Kernel Version 20.2.0: Wed Dec  2 20:40:21 PST 2020; root:xnu-7195.60.75~1/RELEASE_ARM64_T8101 arm64
   // Resetta: Darwin boomer.local 20.2.0 Darwin Kernel Version 20.2.0: Wed Dec  2 20:40:21 PST 2020; root:xnu-7195.60.75~1/RELEASE_ARM64_T8101 x86_64
-  ua = ua.replace(/xnu-.*RELEASE_[^\s]*/, '');
-
+  ua = ua.replace(/xnu-.*RELEASE_[^\s]*/, '')
   if (/aarch64|arm64|arm8|armv8/i.test(ua)) {
     return 'arm64';
   } else if (/aarch|arm7|armv7/i.test(ua)) {
     return 'armv7l';
   } else if (/arm6|armv6/i.test(ua)) {
     return 'armv6l';
-  } else if (/ppc64le/i.test(ua)) {
-    return 'ppc64le';
   } else if (/ppc64/i.test(ua)) {
     return 'ppc64';
   } else if (/mips64/i.test(ua)) {
@@ -95,27 +82,7 @@ function getArch(ua) {
   }
 }
 
-function getLibc(ua) {
-  if ('-' === ua) {
-    return '-';
-  }
-
-  // Use native 'libc' information, if provided
-  //
-  // Generally, we prefer 'musl' builds because they DO work on glibc systems (Ubuntu),
-  // but 'glibc' builds will NOT work on musl systems (Alpine / Docker).
-  //
-  // However, there are a few instances (ex: Node.js), where the 'musl' builds
-  // DO NOT work on glibc systems.
-  if (ua.match(MUSL_NATIVE)) {
-    return MUSL_NATIVE;
-  }
-
-  // TODO handle explicit invalid different
-  return '';
-}
-
+var uaDetect = module.exports;
 uaDetect.os = getOs;
 uaDetect.arch = getArch;
-uaDetect.libc = getLibc;
 uaDetect.request = getRequest;

_webi/webi-pwsh.ps1

@@ -1,4 +1,4 @@
-#!/usr/bin/env pwsh
+#!/usr/bin/env pwsh
 
 # this allows us to call ps1 files, which allows us to have spaces in filenames
 # ('powershell "$Env:USERPROFILE\test.ps1" foo' will fail if it has a space in
@@ -14,94 +14,60 @@ $ProgressPreference = 'SilentlyContinue'
 # This is the canonical CPU arch when the process is emulated
 $my_arch = "$Env:PROCESSOR_ARCHITEW6432"
 IF ($my_arch -eq $null -or $my_arch -eq "") {
-    # This is the canonical CPU arch when the process is native
-    $my_arch = "$Env:PROCESSOR_ARCHITECTURE"
+  # This is the canonical CPU arch when the process is native
+  $my_arch = "$Env:PROCESSOR_ARCHITECTURE"
 }
-IF ($my_arch -eq "AMD64") {
-    # Because PowerShell isn't ARM yet.
-    # See https://oofhours.com/2020/02/04/powershell-on-windows-10-arm64/
-    $my_os_arch = wmic os get osarchitecture
-
-    # Using -clike because of the trailing newline
-    IF ($my_os_arch -clike "ARM 64*") {
-        $my_arch = "ARM64"
-    }
-}
-
+# TODO API should know to prefer x86 for windows when arm binary is not available
 $Env:WEBI_UA = "Windows/10 $my_arch"
 $exename = $args[0]
 
 # Switch to userprofile
-Push-Location $Env:USERPROFILE
+pushd $Env:USERPROFILE
 
 # Make paths if needed
-New-Item -Path .local\bin -ItemType Directory -Force | Out-Null
+New-Item -Path .local\bin -ItemType Directory -Force | out-null
 # TODO replace all xbin with opt\bin\
-New-Item -Path .local\xbin -ItemType Directory -Force | Out-Null
+New-Item -Path .local\xbin -ItemType Directory -Force | out-null
 
 # See note on Set-ExecutionPolicy above
 Set-Content -Path .local\bin\webi.bat -Value "@echo off`r`npushd %USERPROFILE%`r`npowershell -ExecutionPolicy Bypass .local\bin\webi-pwsh.ps1 %1`r`npopd"
 # Backwards-compat bugfix: remove old webi-pwsh.ps1 location
 Remove-Item -Path .local\bin\webi.ps1 -Recurse -ErrorAction Ignore
-if (!(Test-Path -Path .local\opt)) {
-    New-Item -Path .local\opt -ItemType Directory -Force | Out-Null
+if (!(Test-Path -Path .local\opt))
+{
+    New-Item -Path .local\opt -ItemType Directory -Force | out-null
 }
 # TODO windows version of mktemp -d
-if (!(Test-Path -Path .local\tmp)) {
-    New-Item -Path .local\tmp -ItemType Directory -Force | Out-Null
+if (!(Test-Path -Path .local\tmp))
+{
+    New-Item -Path .local\tmp -ItemType Directory -Force | out-null
 }
 
 # TODO SetStrictMode
 # TODO Test-Path variable:global:Env:WEBI_HOST ???
-IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") {
+IF($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "")
+{
     $Env:WEBI_HOST = "https://webinstall.dev"
 }
 
+if (!(Test-Path -Path .local\bin\pathman.exe))
+{
+    & curl.exe -fsSL -A "$Env:WEBI_UA" "$Env:WEBI_HOST/packages/pathman/install.ps1" -o .\.local\tmp\pathman-setup.ps1
+    powershell .\.local\tmp\pathman-setup.ps1
+    # TODO del .\.local\tmp\pathman-setup.bat
+}
+
+# Run pathman to set up the folder
+# (using unix style path because... cmd vs powershell vs whatever)
+& "$Env:USERPROFILE\.local\bin\pathman.exe" add ~/.local/bin
+
 # {{ baseurl }}
 # {{ version }}
 
-$my_version = 'v1.1.15'
-
-## show help if no params given or help flags are used
-if ($null -eq $exename -or $exename -eq "-h" -or $exename -eq "--help" -or $exename -eq "help" -or $exename -eq "/?") {
-    Write-Host "webi " -ForegroundColor Green -NoNewline; Write-Host "$my_version " -ForegroundColor Red -NoNewline; Write-Host "Copyright 2020+ AJ ONeal"
-    Write-Host "  https://webinstall.dev/webi" -ForegroundColor blue
-    Write-Output ""
-    Write-Output "SUMMARY"
-    Write-Output "    Webi is the best way to install the modern developer tools you love."
-    Write-Output "    It's fast, easy-to-remember, and conflict free."
-    Write-Output ""
-    Write-Output "USAGE"
-    Write-Output "    webi <thing1>[@version] [thing2] ..."
-    Write-Output ""
-    Write-Output "UNINSTALL"
-    Write-Output "    Almost everything that is installed with webi is scoped to"
-    Write-Output "    ~/.local/opt/<thing1>, so you can remove it like so:"
-    Write-Output ""
-    Write-Output "    rmdir /s %USERPROFILE%\.local\opt\<thing1>"
-    Write-Output "    del %USERPROFILE%\.local\bin\<thing1>"
-    Write-Output ""
-    Write-Output "    Some packages have special uninstall instructions, check"
-    Write-Output "    https://webinstall.dev/<thing1> to be sure."
-    Write-Output ""
-    Write-Output "FAQ"
-    Write-Host "    See " -NoNewline; Write-Host "https://webinstall.dev/faq" -ForegroundColor blue
-    Write-Output ""
-    Write-Output "ALWAYS REMEMBER"
-    Write-Output "    Friends don't let friends use brew for simple, modern tools that don't need it."
-    exit 0
-}
-
-if ($exename -eq "-V" -or $exename -eq "--version" -or $exename -eq "version" -or $exename -eq "/v") {
-    Write-Host "webi " -ForegroundColor Green -NoNewline; Write-Host "$my_version " -ForegroundColor Red -NoNewline; Write-Host "Copyright 2020+ AJ ONeal"
-    Write-Host "  https://webinstall.dev/webi" -ForegroundColor blue
-    exit 0
-}
-
 # Fetch <whatever>.ps1
 # TODO detect formats
 $PKG_URL = "$Env:WEBI_HOST/api/installers/$exename.ps1?formats=zip,exe,tar"
-Write-Output "Downloading $PKG_URL"
+echo "Downloading $PKG_URL"
 # Invoke-WebRequest -UserAgent "Windows amd64" "$PKG_URL" -OutFile ".\.local\tmp\$exename.install.ps1"
 & curl.exe -fsSL -A "$Env:WEBI_UA" "$PKG_URL" -o .\.local\tmp\$exename.install.ps1
 
@@ -109,4 +75,4 @@ Write-Output "Downloading $PKG_URL"
 powershell .\.local\tmp\$exename.install.ps1
 
 # Done
-Pop-Location
+popd

_webi/webi.bat

@@ -10,7 +10,18 @@ pushd "%userprofile%" || goto :error
     mkdir .local\opt || goto :error
   )
 
-  echo Downloading and installing %1
+  pushd .local\bin || goto :error
+    if NOT EXIST pathman.exe (
+      echo updating PATH management
+      powershell $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest https://webinstall.dev/packages/pathman/install.bat -OutFile pathman-setup.bat || goto :error
+      call .\pathman-setup.bat || goto :error
+      del pathman-setup.bat  || goto :error
+      rem TODO there's rumor of a windows tool called 'pathman' that does the same thing?
+    )
+  popd || goto :error
+  .\.local\bin\pathman add ".local\bin" || goto :error
+
+  echo downloading and installing %1
   powershell $ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest https://webinstall.dev/packages/%1/install.ps1 -OutFile %1-webinstall.bat || goto :error
 
   rem TODO only add if it's not in there already

aliasman/README.md

@@ -1,125 +0,0 @@
----
-title: aliasman
-homepage: https://github.com/BeyondCodeBootcamp/aliasman
-tagline: |
-  aliasman: A cross-shell (POSIX-compliant) alias manager for bash, zsh, and fish
----
-
-To update or switch versions, run `webi aliasman@stable` (or `@v1.0.0`, `@beta`,
-etc).
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.config/envman/alias.env
-~/.local/bin/aliasman
-```
-
-## Cheat Sheet
-
-> `aliasman` helps you love your *alias*es again! 🥸 \
-> Set 'em once, use 'em everywhere! \
-> (and all in just one dotfile, for an on-the-go friendly config)
-
-```sh
-aliasman <alias-name> <command-name> [args, pipes, redirs, etc]
-```
-
-### What are Aliases?
-
-An _alias_ is just shorthand for a shell function.
-
-Take a long command like this:
-
-```sh
-git commit -m "feat: new feature"
-```
-
-And turn it into a short command, like this:
-
-```sh
-gc "feat: new feature"
-```
-
-(that would be `aliasman gc 'git commit -m'`)
-
-### Imagine the possibilities!
-
-1. What if you could quickly create a _command_, `ll`, \
-   that does the work of `ls -lAhF`!?
-2. Set an _alias_ to do just that!
-   ```sh
-   aliasman ll 'ls -lAhF'
-   ```
-3. Reload your alias config (or open a _new terminal_)
-   ```sh
-   source ~/.config/envman/alias.env
-   ```
-4. Use it!
-   ```sh
-   ll
-   ```
-   ```text
-   drwxr-xr-x aj wheel 416 B  Thu Feb  9 02:08:39 2023 📂 .git/
-   .rwxr-xr-x aj staff 6.2 KB Thu Feb  9 01:36:30 2023 💻 aliasman*
-   .rw-r--r-- aj wheel  16 KB Wed Feb  8 21:51:06 2023 🔑 LICENSE
-   .rw-r--r-- aj wheel 1.4 KB Thu Feb  9 01:47:13 2023 📄 README.md
-   ```
-
-### Common aliases
-
-Use *alias*es to make other tools you find around webi even _more_ convenient
-⚡️ (and powerful 💪).
-
-```sh
-aliasman curl 'curlie'
-
-aliasman diffy 'diff -y --suppress-common-lines'
-
-aliasman gc 'git commit -m'
-aliasman gri 'git rebase -i'
-
-aliasman la 'lsd -AF'
-aliasman ll 'lsd -lAhF'
-aliasman ls 'lsd -F'
-
-aliasman rgi 'rg -i'
-
-aliasman tree 'lsd -F --tree --group-dirs=last'
-
-# random password generator
-aliasman rnd 'xxd -l24 -ps /dev/urandom'
-```
-
-### How to replace an alias
-
-Just run the command again!
-
-```sh
-aliasman ll 'lsd -l'
-aliasman ll 'lsd -lAhF'
-```
-
-### How to delete an alias
-
-With `--delete`!
-
-```sh
-aliasman --delete ll
-```
-
-### How to see an alias
-
-Just supply the name!
-
-```sh
-aliasman rnd
-```
-
-```text
-alias rnd='xxd -l24 -ps /dev/urandom'
-```

aliasman/install.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-__init_aliasman() {
-
-    ######################
-    # Install aliasman #
-    ######################
-
-    # Every package should define these 6 variables
-    pkg_cmd_name="aliasman"
-
-    pkg_dst_cmd="$HOME/.local/bin/aliasman"
-    pkg_dst="$pkg_dst_cmd"
-
-    pkg_src_cmd="$HOME/.local/opt/aliasman-v$WEBI_VERSION/bin/aliasman"
-    pkg_src_dir="$HOME/.local/opt/aliasman-v$WEBI_VERSION"
-    pkg_src="$pkg_src_cmd"
-
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/aliasman-v1.0.0/bin
-        mkdir -p "$(dirname "$pkg_src_cmd")"
-
-        # mv ./*aliasman*/aliasman ~/.local/opt/aliasman-v1.0.0/bin/aliasman
-        mv ./*aliasman*/aliasman "$pkg_src_cmd"
-    }
-
-    # pkg_get_current_version is recommended, but (soon) not required
-    pkg_get_current_version() {
-        # 'aliasman version' has output in this format:
-        #       aliasman v1.0.0 (2023-01-15)
-        #       Copyright 2023 AJ ONeal
-        # This trims it down to just the version number:
-        #       1.0.0
-        aliasman version | head -n 1 | cut -d ' ' -f 2 | sed 's:^v::'
-    }
-}
-
-__init_aliasman

aliasman/releases.js

@@ -1,29 +0,0 @@
-'use strict';
-
-var githubSource = require('../_common/github-source.js');
-var owner = 'BeyondCodeBootcamp';
-var repo = 'aliasman';
-
-module.exports = function (request) {
-  let arches = [
-    'amd64',
-    'arm64',
-    'armv6l',
-    'armv7l',
-    'ppc64le',
-    'ppc64',
-    's390x',
-    'x86',
-  ];
-  let oses = ['freebsd', 'linux', 'macos', 'posix'];
-  return githubSource(request, owner, repo, oses, arches).then(function (all) {
-    return all;
-  });
-};
-
-if (module === require.main) {
-  module.exports(require('@root/request')).then(function (all) {
-    all = require('../_webi/normalize.js')(all);
-    console.info(JSON.stringify(all, null, 2));
-  });
-}

arc/README.md

@@ -5,17 +5,11 @@ tagline: |
   Arc is a cross-platform, multi-format archive utility.
 ---
 
-To update or switch versions, run `webi arc@stable` (or `@v3.5`, `@beta`, etc).
+## Updating `arc`
 
-### Files
+`webi arc@stable`
 
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/arc
-```
+Use the `@beta` tag for pre-releases.
 
 ## Cheat Sheet
 
@@ -28,42 +22,42 @@ create a top-level directory if one does not exist.
 
 ### List
 
-```text
+```txt
 # arc ls <archive file>
 arc ls   example.zip
 ```
 
 ### Unarchive (whole)
 
-```text
+```txt
 # arc unarchive <archive file>
 arc unarchive   example.zip
 ```
 
 ### Extract (partial)
 
-```text
+```txt
 # arc extract <archive file> <archived path> <extracted path>
 arc extract   example.zip    example/foo     ~/Downloads/foo
 ```
 
 ### Archive (recursive)
 
-```text
+```txt
 # arc archive <archive file> <files or folders ...>
 arc archive   example.zip    ./README.md ./bin ./src
 ```
 
 ### Compress (single file)
 
-```text
+```txt
 # arc compress <single file> <format>
 arc compress   ./example.tar xz
 ```
 
 ### Decompress (single file)
 
-```text
+```txt
 # arc decompress <archive file>
 arc decompress   ./example.tar.xz
 ```

arc/install.ps1

@@ -15,39 +15,41 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\archiver-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\archiver-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading archiver from $Env:WEBI_PKG_URL to $pkg_download"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading archiver from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
+    & move "$pkg_download.part" "$pkg_download"
 }
 
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing archiver"
+IF (!(Test-Path -Path "$pkg_src_cmd"))
+{
+    echo "Installing archiver"
 
     # TODO: create package-specific temp directory
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\arc-*" -Recurse -ErrorAction Ignore
-    Remove-Item -Path ".\arc.exe" -Recurse -ErrorAction Ignore
+    	# Remove any leftover tmp cruft
+        Remove-Item -Path ".\arc-*" -Recurse -ErrorAction Ignore
+        Remove-Item -Path ".\arc.exe" -Recurse -ErrorAction Ignore
 
-    # Move single binary into root of temporary folder
-    & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "arc.exe"
+        # Move single binary into root of temporary folder
+        & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "arc.exe"
 
-    # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
-    Move-Item -Path "arc.exe" -Destination "$pkg_src_bin"
+        # Settle unpacked archive into place
+        echo "Install Location: $pkg_src_cmd"
+        New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
+        Move-Item -Path "arc.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
+echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

arc/install.sh

@@ -1,8 +1,6 @@
-#!/bin/sh
-set -e
-set -u
-
-__init_arc() {
+{
+    set -e
+    set -u
 
     ####################
     # Install archiver #
@@ -21,7 +19,7 @@ __init_arc() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/arc-v3.2.0/bin
-        mkdir -p "$(dirname "$pkg_src_cmd")"
+        mkdir -p "$(dirname $pkg_src_cmd)"
 
         # mv ./arc_* ~/.local/opt/arc-v3.2.0/bin/arc
         mv ./arc_* "$pkg_src_cmd"
@@ -33,8 +31,6 @@ __init_arc() {
         #       arc v3.5.0 (25e050d) 2020-10-30T03:27:58Z
         # This trims it down to just the version number:
         #       3.5.0
-        arc version 2> /dev/null | head -n 1 | cut -d' ' -f2 | sed 's:^v::'
+        echo "$(arc version 2> /dev/null | head -n 1 | cut -d' ' -f2 | sed 's:^v::')"
     }
 }
-
-__init_arc

archiver/README.md

@@ -1,11 +0,0 @@
----
-title: Archiver (arc alias)
-homepage: https://webinstall.dev/arc
-tagline: |
-  Alias for https://webinstall.dev/arc
-alias: arc
-description: |
-  See https://webinstall.dev/arc
----
-
-Alias for https://webinstall.dev/arc

archiver/install.ps1

@@ -1,5 +1,5 @@
 #!/bin/pwsh
 
-Write-Output "'archiver@$Env:WEBI_TAG' is an alias for 'arc@$Env:WEBI_VERSION'"
-IF ($null -eq $Env:WEBI_HOST -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
+echo "'archiver@$Env:WEBI_TAG' is an alias for 'arc@$Env:WEBI_VERSION'"
+IF ($Env:WEBI_HOST -eq $null -or $Env:WEBI_HOST -eq "") { $Env:WEBI_HOST = "https://webinstall.dev" }
 curl.exe -fsSL "$Env:WEBI_HOST/arc@$Env:WEBI_VERSION" | powershell

archiver/install.sh

@@ -1,11 +1,10 @@
-#!/bin/sh
-set -e
-set -u
+# title: Archiver (arc alias)
+# homepage: https://webinstall.dev/arc
+# tagline: Alias for https://webinstall.dev/arc
+# alias: arc
+# description: |
+#   See https://webinstall.dev/arc
 
-__redirect_alias_arc() {
-    echo "'archiver@${WEBI_TAG:-stable}' is an alias for 'arc@${WEBI_VERSION-}'"
-    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
-    curl -fsSL "$WEBI_HOST/arc@${WEBI_VERSION-}" | sh
-}
-
-__redirect_alias_arc
+echo "'archiver@${WEBI_TAG:-stable}' is an alias for 'arc@${WEBI_VERSION:-}'"
+WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+curl -fsSL "$WEBI_HOST/arc@${WEBI_VERSION:-}" | bash

atomicparsley/README.md

@@ -1,538 +0,0 @@
----
-title: atomicparsley
-homepage: https://github.com/wez/atomicparsley
-tagline: |
-  AtomicParsley is a lightweight tool for reading, parsing and setting iTunes-style metadata.
----
-
-To update or switch versions, run `webi atomicparsley@stable` (or `@v20221229`,
-`@beta`, etc).
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/AtomicParsley
-```
-
-**Windows Users**
-
-```text
-\Windows\System32\vcruntime140.dll
-```
-
-This will also attempt to install the
-[Microsoft Visual C++ Redistributable](/vcruntime) via `webi vcruntime`. If it
-fails and you get the error _`vcruntime140.dll` was not found_, you'll need to
-[install it manually](https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170).
-
-## Cheat Sheet
-
-> `AtomicParsley` is an alternative to `ffmpeg` and `ffprobe` for viewing and
-> changing metadata in MPEG-4 files with .3gp, .3g2, .mp4, .m4a, .m4b, .m4p,
-> .m4r, and .m4v extensions. Because it's purpose-built for MP4 containers, it
-> can do some things `ffmpeg` can't.
-
-### How to Change Album Art
-
-1. Save any existing cover art
-   ```sh
-   AtomicParsley ./my-song.m4a --extractPixToPath ./ 'my-song'
-   ```
-2. Remove the artwork
-   ```sh
-   AtomicParsley ./my-song.m4a --artwork REMOVE_ALL
-   ```
-3. **(macOS ONLY)** Add new artwork at the specified DPI (and other constraints)
-
-   ```sh
-   export PIC_OPTIONS="DPI=72"
-
-   AtomicParsley ./my-podcast-audiobook.m4b --artwork ./my-season-1-cover.jpg
-   ```
-
-Only JPEG and PNG are supported. See `PIC_OPTIONS` down below for more options.
-If you get an error, try exporting your file with a DPI to 72 (or up to 300 with
-`PIC_OPTIONS` set) and a smaller resolution - perhaps 600x600 or 1500x1500 (what
-old versions iTunes versions used).
-
-### How to Remove Apple Account Info
-
-```sh
-AtomicParsley ./my-file.m4a \
-    --DeepScan \
-    --manualAtomRemove "moov.trak.mdia.minf.stbl.mp4a.pinf" \
-    --manualAtomRemove "moov.udta.meta.ilst.apID" \
-    --manualAtomRemove "moov.udta.meta.ilst.cnID" \
-    --manualAtomRemove "moov.udta.meta.ilst.purd" \
-    --manualAtomRemove "moov.udta.meta.ilst.sfID" \
-    --manualAtomRemove "moov.udta.meta.ilst.soal" \
-    --manualAtomRemove "moov.udta.meta.ilst.xid"
-```
-
-If you wanted to also remove information that indicates which Country or
-Language the song was purchased in, or which album it was purchased from, there
-are some additional IDs to consider:
-
-| Metadata Tag                             | Description                                  |
-| ---------------------------------------- | -------------------------------------------- |
-| moov.udta.meta.ilst.apID                 | Apple account email address                  |
-| moov.udta.meta.ilst.ownr                 | Apple account username                       |
-| moov.udta.meta.ilst.atID                 | Artist-track ID                              |
-| moov.udta.meta.ilst.cnID                 | iTunes Catalog ID                            |
-| moov.udta.meta.ilst.geID                 | Genre ID                                     |
-| moov.udta.meta.ilst.plID                 | Playlist ID (identifies album)               |
-| moov.udta.meta.ilst.sfID                 | iTunes store identifier (location/number)    |
-| moov.udta.meta.ilst.cprt                 | Copyright information                        |
-| moov.udta.meta.ilst.flvr                 | Bitrate/video size related                   |
-| moov.udta.meta.ilst.purd                 | Date purchased                               |
-| moov.udta.meta.ilst.rtng                 | Explicit/Clean information                   |
-| moov.udta.meta.ilst.soal                 | Album sort name                              |
-| moov.udta.meta.ilst.stik                 | Media type information                       |
-| moov.udta.meta.ilst.xid                  | Vendor xID                                   |
-| moov.udta.meta.ilst.----.name:[iTunMOVI] | Embedded plist contains filesize and flavor. |
-| moov.trak.mdia.minf.stbl.stsd.mp4a.pinf  | Purchase information related                 |
-
-See <https://gist.github.com/riophae/f5694fd2952cb64982689b971ca6ec79>.
-
-### Genre Lists
-
-All values are **case sensitive**.
-
-#### The "stik" List
-
-These values are **case sensitive**:
-
-0. `Home Video`
-1. `Normal` (meaning music)
-2. `Audiobook` (changes extension to .m4b)
-3. `Whacked Bookmark`
-4. `Music Video`
-5. `Movie`
-6. `Short Film`
-7. `TV Show`
-8. `Booklet`
-
-#### Standard Music Genres
-
-```txt
-(1.)  Blues
-(2.)  Classic Rock
-(3.)  Country
-(4.)  Dance
-(5.)  Disco
-(6.)  Funk
-(7.)  Grunge
-(8.)  Hip-Hop
-(9.)  Jazz
-(10.)  Metal
-(11.)  New Age
-(12.)  Oldies
-(13.)  Other
-(14.)  Pop
-(15.)  R&B
-(16.)  Rap
-(17.)  Reggae
-(18.)  Rock
-(19.)  Techno
-(20.)  Industrial
-(21.)  Alternative
-(22.)  Ska
-(23.)  Death Metal
-(24.)  Pranks
-(25.)  Soundtrack
-(26.)  Euro-Techno
-(27.)  Ambient
-(28.)  Trip-Hop
-(29.)  Vocal
-(30.)  Jazz+Funk
-(31.)  Fusion
-(32.)  Trance
-(33.)  Classical
-(34.)  Instrumental
-(35.)  Acid
-(36.)  House
-(37.)  Game
-(38.)  Sound Clip
-(39.)  Gospel
-(40.)  Noise
-(41.)  AlternRock
-(42.)  Bass
-(43.)  Soul
-(44.)  Punk
-(45.)  Space
-(46.)  Meditative
-(47.)  Instrumental Pop
-(48.)  Instrumental Rock
-(49.)  Ethnic
-(50.)  Gothic
-(51.)  Darkwave
-(52.)  Techno-Industrial
-(53.)  Electronic
-(54.)  Pop-Folk
-(55.)  Eurodance
-(56.)  Dream
-(57.)  Southern Rock
-(58.)  Comedy
-(59.)  Cult
-(60.)  Gangsta
-(61.)  Top 40
-(62.)  Christian Rap
-(63.)  Pop/Funk
-(64.)  Jungle
-(65.)  Native American
-(66.)  Cabaret
-(67.)  New Wave
-(68.)  Psychadelic
-(69.)  Rave
-(70.)  Showtunes
-(71.)  Trailer
-(72.)  Lo-Fi
-(73.)  Tribal
-(74.)  Acid Punk
-(75.)  Acid Jazz
-(76.)  Polka
-(77.)  Retro
-(78.)  Musical
-(79.)  Rock & Roll
-(80.)  Hard Rock
-(81.)  Folk
-(82.)  Folk/Rock
-(83.)  National Folk
-(84.)  Swing
-(85.)  Fast Fusion
-(86.)  Bebob
-(87.)  Latin
-(88.)  Revival
-(89.)  Celtic
-(90.)  Bluegrass
-(91.)  Avantgarde
-(92.)  Gothic Rock
-(93.)  Progressive Rock
-(94.)  Psychedelic Rock
-(95.)  Symphonic Rock
-(96.)  Slow Rock
-(97.)  Big Band
-(98.)  Chorus
-(99.)  Easy Listening
-(100.)  Acoustic
-(101.)  Humour
-(102.)  Speech
-(103.)  Chanson
-(104.)  Opera
-(105.)  Chamber Music
-(106.)  Sonata
-(107.)  Symphony
-(108.)  Booty Bass
-(109.)  Primus
-(110.)  Porn Groove
-(111.)  Satire
-(112.)  Slow Jam
-(113.)  Club
-(114.)  Tango
-(115.)  Samba
-(116.)  Folklore
-(117.)  Ballad
-(118.)  Power Ballad
-(119.)  Rhythmic Soul
-(120.)  Freestyle
-(121.)  Duet
-(122.)  Punk Rock
-(123.)  Drum Solo
-(124.)  A Capella
-(125.)  Euro-House
-(126.)  Dance Hall
-```
-
-#### iTunes Movie Genre IDs
-
-```sh
-AtomicParsley --genre-movie-id-list
-```
-
-```text
-(4401) Action & Adventure
-(4402) Anime
-(4403) Classics
-(4404) Comedy
-(4405) Documentary
-(4406) Drama
-(4407) Foreign
-(4408) Horror
-(4409) Independent
-(4410) Kids & Family
-(4411) Musicals
-(4412) Romance
-(4413) Sci-Fi & Fantasy
-(4414) Short Films
-(4415) Special Interest
-(4416) Thriller
-(4417) Sports
-(4418) Western
-(4419) Urban
-(4420) Holiday
-(4421) Made for TV
-(4422) Concert Films
-(4423) Music Documentaries
-(4424) Music Feature Films
-(4425) Japanese Cinema
-(4426) Jidaigeki
-(4427) Tokusatsu
-(4428) Korean Cinema
-```
-
-#### iTunes TV Genre IDs
-
-```sh
-AtomicParsley --genre-tv-id-list
-```
-
-```text
-(4000) Comedy
-(4001) Drama
-(4002) Animation
-(4003) Action & Adventure
-(4004) Classic
-(4005) Kids
-(4005) Nonfiction
-(4007) Reality TV
-(4008) Sci-Fi & Fantasy
-(4009) Sports
-(4010) Teens
-(4011) Latino TV
-```
-
-### Help
-
-Note: Normally we don't include full help text, but since AtomicParsley has a
-long history across various maintainers and repos, we feel it's appropriate to
-do so in this case.
-
-```text
-AtomicParsley sets metadata into MPEG-4 files & derivatives supporting 3 tag
- schemes: iTunes-style, 3GPP assets & ISO defined copyright notifications.
-
-AtomicParsley quick help for setting iTunes-style metadata into MPEG-4 files.
-
-General usage examples:
-  AtomicParsley /path/to.mp4 -T 1
-  AtomicParsley /path/to.mp4 -t +
-  AtomicParsley /path/to.mp4 --artist "Me" --artwork /path/to/art.jpg
-  Atomicparsley /path/to.mp4 --albumArtist "You" --podcastFlag true
-  Atomicparsley /path/to.mp4 --stik "TV Show" --advisory explicit
-
-Getting information about the file & tags:
-  -T  --test        Test file for mpeg4-ishness & print atom tree
-  -t  --textdata    Prints tags embedded within the file
-  -E  --extractPix  Extracts pix to the same folder as the mpeg-4 file
-
-Setting iTunes-style metadata tags
-  --artist       (string)     Set the artist tag
-  --title        (string)     Set the title tag
-  --album        (string)     Set the album tag
-  --genre        (string)     Genre tag (see --longhelp for more info)
-  --tracknum     (num)[/tot]  Track number (or track number/total tracks)
-  --disk         (num)[/tot]  Disk number (or disk number/total disks)
-  --comment      (string)     Set the comment tag
-  --year         (num|UTC)    Year tag (see --longhelp for "Release Date")
-  --lyrics       (string)     Set lyrics (not subject to 256 byte limit)
-  --lyricsFile   (/path)      Set lyrics to the content of a file
-  --composer     (string)     Set the composer tag
-  --copyright    (string)     Set the copyright tag
-  --grouping     (string)     Set the grouping tag
-  --artwork      (/path)      Set a piece of artwork (jpeg or png only)
-  --bpm          (number)     Set the tempo/bpm
-  --albumArtist  (string)     Set the album artist tag
-  --compilation  (boolean)    Set the compilation flag (true or false)
-  --hdvideo      (number)     Set the hdvideo flag to one of:
-                              false or 0 for standard definition
-                              true or 1 for 720p
-                              2 for 1080p
-  --advisory     (string*)    Content advisory (*values: 'clean', 'explicit')
-  --stik         (string*)    Sets the iTunes "stik" atom (see --longhelp)
-  --description  (string)     Set the description tag
-  --longdesc     (string)     Set the long description tag
-  --storedesc    (string)     Set the store description tag
-  --TVNetwork    (string)     Set the TV Network name
-  --TVShowName   (string)     Set the TV Show name
-  --TVEpisode    (string)     Set the TV episode/production code
-  --TVSeasonNum  (number)     Set the TV Season number
-  --TVEpisodeNum (number)     Set the TV Episode number
-  --podcastFlag  (boolean)    Set the podcast flag (true or false)
-  --category     (string)     Sets the podcast category
-  --keyword      (string)     Sets the podcast keyword
-  --podcastURL   (URL)        Set the podcast feed URL
-  --podcastGUID  (URL)        Set the episode's URL tag
-  --purchaseDate (UTC)        Set time of purchase
-  --encodingTool (string)     Set the name of the encoder
-  --encodedBy    (string)     Set the name of the Person/company who encoded the file
-  --apID         (string)     Set the Account Name
-  --cnID         (number)     Set the iTunes Catalog ID (see --longhelp)
-  --geID         (number)     Set the iTunes Genre ID (see --longhelp)
-  --xID          (string)     Set the vendor-supplied iTunes xID (see --longhelp)
-  --gapless      (boolean)    Set the gapless playback flag
-  --contentRating (string*)   Set tv/mpaa rating (see -rDNS-help)
-
-Deleting tags
-  Set the value to "":        --artist "" --stik "" --bpm ""
-  To delete (all) artwork:    --artwork REMOVE_ALL
-  manually removal:           --manualAtomRemove "moov.udta.meta.ilst.ATOM"
-
-More detailed iTunes help is available with AtomicParsley --longhelp
-Setting reverse DNS forms for iTunes files: see --reverseDNS-help
-Setting 3gp assets into 3GPP & derivative files: see --3gp-help
-Setting copyright notices for all files: see --ISO-help
-For file-level options & padding info: see --file-help
-Setting custom private tag extensions: see --uuid-help
-Setting ID3 tags onto mpeg-4 files: see --ID3-help
-
-----------------------------------------------------------------------
-AtomicParsley version: 20221229.172126.0 d813aa6e0304ed3ab6d92f1ae96cd52b586181ec (utf8)
-
-Submit bug fixes to https://github.com/wez/atomicparsley
-```
-
-### `--longhelp`
-
-```text
-AtomicParsley help page for setting iTunes-style metadata into MPEG-4 files.
-              (3gp help available with AtomicParsley --3gp-help)
-          (ISO copyright help available with AtomicParsley --ISO-help)
-      (reverse DNS form help available with AtomicParsley --reverseDNS-help)
-Usage: AtomicParsley [mp4FILE]... [OPTION]... [ARGUMENT]... [ [OPTION2]...[ARGUMENT2]...]
-
-example: AtomicParsley /path/to.mp4 -e ~/Desktop/pix
-example: AtomicParsley /path/to.mp4 --podcastURL "http://www.url.net" --tracknum 45/356
-example: AtomicParsley /path/to.mp4 --copyright "℗ © 2006"
-example: AtomicParsley /path/to.mp4 --year "2006-07-27T14:00:43Z" --purchaseDate timestamp
-example: AtomicParsley /path/to.mp4 --sortOrder artist "Mighty Dub Cats, The
-------------------------------------------------------------------------------------------------
-  Extract any pictures in user data "covr" atoms to separate files.
-  --extractPix       ,  -E                     Extract to same folder (basename derived from file).
-  --extractPixToPath ,  -e  (/path/basename)   Extract to specific path (numbers added to basename).
-                                                 example: --e ~/Desktop/SomeText
-                                                 gives: SomeText_artwork_1.jpg  SomeText_artwork_2.png
-                                               Note: extension comes from embedded image file format
-------------------------------------------------------------------------------------------------
- Tag setting options:
-
-  --artist           ,  -a   (str)    Set the artist tag: "moov.udta.meta.ilst.©ART.data"
-  --title            ,  -s   (str)    Set the title tag: "moov.udta.meta.ilst.©nam.data"
-  --album            ,  -b   (str)    Set the album tag: "moov.udta.meta.ilst.©alb.data"
-  --genre            ,  -g   (str)    Set the genre tag: "©gen" (custom) or "gnre" (standard).
-                                          see the standard list with "AtomicParsley --genre-list"
-  --tracknum         ,  -k   (num)[/tot]  Set the track number (or track number & total tracks).
-  --disk             ,  -d   (num)[/tot]  Set the disk number (or disk number & total disks).
-  --comment          ,  -c   (str)    Set the comment tag: "moov.udta.meta.ilst.©cmt.data"
-  --year             ,  -y   (num|UTC)    Set the year tag: "moov.udta.meta.ilst.©day.data"
-                                          set with UTC "2006-09-11T09:00:00Z" for Release Date
-  --lyrics           ,  -l   (str)    Set the lyrics tag: "moov.udta.meta.ilst.©lyr.data"
-  --lyricsFile       ,       (/path)  Set the lyrics tag to the content of a file
-  --composer         ,  -w   (str)    Set the composer tag: "moov.udta.meta.ilst.©wrt.data"
-  --copyright        ,  -x   (str)    Set the copyright tag: "moov.udta.meta.ilst.cprt.data"
-  --grouping         ,  -G   (str)    Set the grouping tag: "moov.udta.meta.ilst.©grp.data"
-  --artwork          ,  -A   (/path)  Set a piece of artwork (jpeg or png) on "covr.data"
-                                          Note: multiple pieces are allowed with more --artwork args
-  --bpm              ,  -B   (num)    Set the tempo/bpm tag: "moov.udta.meta.ilst.tmpo.data"
-  --albumArtist      ,  -A   (str)    Set the album artist tag: "moov.udta.meta.ilst.aART.data"
-  --compilation      ,  -C   (bool)   Sets the "cpil" atom (true or false to delete the atom)
-  --hdvideo          ,  -V   (bool)   Sets the "hdvd" atom (true or false to delete the atom)
-  --advisory         ,  -y   (1of3)   Sets the iTunes lyrics advisory ('remove', 'clean', 'explicit')
-  --stik             ,  -S   (1of7)   Sets the iTunes "stik" atom (--stik "remove" to delete)
-                                           "Movie", "Normal", "TV Show" .... others:
-                                           see the full list with "AtomicParsley --stik-list"
-                                           or set in an integer value with --stik value=(num)
-                                      Note: --stik Audiobook will change file extension to '.m4b'
-  --description      ,  -p   (str)    Sets the description on the "desc" atom
-  --Rating           ,       (str)    Sets the Rating on the "rate" atom
-  --longdesc         ,  -j   (str)    Sets the long description on the "ldes" atom
-  --storedesc        ,       (str)    Sets the iTunes store description on the "sdes" atom
-  --TVNetwork        ,  -n   (str)    Sets the TV Network name on the "tvnn" atom
-  --TVShowName       ,  -H   (str)    Sets the TV Show name on the "tvsh" atom
-  --TVEpisode        ,  -I   (str)    Sets the TV Episode on "tven":"209", but it is a string: "209 Part 1"
-  --TVSeasonNum      ,  -U   (num)    Sets the TV Season number on the "tvsn" atom
-  --TVEpisodeNum     ,  -N   (num)    Sets the TV Episode number on the "tves" atom
-  --podcastFlag      ,  -f   (bool)   Sets the podcast flag (values are "true" or "false")
-  --category         ,  -q   (str)    Sets the podcast category; typically a duplicate of its genre
-  --keyword          ,  -K   (str)    Sets the podcast keyword; invisible to MacOSX Spotlight
-  --podcastURL       ,  -L   (URL)    Set the podcast feed URL on the "purl" atom
-  --podcastGUID      ,  -J   (URL)    Set the episode's URL tag on the "egid" atom
-  --purchaseDate     ,  -D   (UTC)    Set Universal Coordinated Time of purchase on a "purd" atom
-                                       (use "timestamp" to set UTC to now; can be akin to id3v2 TDTG tag)
-  --encodingTool     ,       (str)    Set the name of the encoder on the "©too" atom
-  --encodedBy        ,       (str)    Set the name of the Person/company who encoded the file on the "©enc" atom
-  --apID             ,  -Y   (str)    Set the name of the Account Name on the "apID" atom
-  --cnID             ,       (num)    Set iTunes Catalog ID, used for combining SD and HD encodes in iTunes on the "cnID" atom
-
-                                      To combine you must set "hdvd" atom on one file and must have same "stik" on both file
-                                      Must not use "stik" of value Home Video(0), use Movie(9)
-
-                                      iTunes Catalog numbers can be obtained by finding the item in the iTunes Store.  Once item
-                                      is found in the iTunes Store right click on picture of item and select copy link.  Paste this link
-                                      into a document or web browser to display the catalog number ID.
-
-                                      An example link for the video Street Kings is:
-                                      http://itunes.apple.com/WebObjects/MZStore.woa/wa/viewMovie?id=278743714&s=143441
-                                      Here you can see the cnID is 278743714
-
-                                      Alternatively you can use iMDB numbers, however these will not match the iTunes catalog.
-
-  --geID             ,       (num)    Set iTunes Genre ID.  This does not necessarily have to match genre.
-                                      See --genre-movie-id-list and --genre-tv-id-list
-
-  --xID              ,       (str)    Set iTunes vendor-supplied xID, used to allow iTunes LPs and iTunes Extras to interact
-                                            with other content in your iTunes Library
-  --gapless          ,       (bool)   Sets the gapless playback flag for a track in a gapless album
-  --sortOrder    (type)      (str)    Sets the sort order string for that type of tag.
-                                       (available types are: "name", "artist", "albumartist",
-                                        "album", "composer", "show")
-
-NOTE: Except for artwork, only 1 of each tag is allowed; artwork allows multiple pieces.
-NOTE: Tags that carry text(str) have a limit of 255 utf8 characters;
-however lyrics and long descriptions have no limit.
-------------------------------------------------------------------------------------------------
- To delete a single atom, set the tag to null (except artwork):
-  --artist "" --lyrics ""
-  --artwork REMOVE_ALL
-  --metaEnema        ,  -P            Douches away every atom under "moov.udta.meta.ilst"
-  --foobar2000Enema  ,  -2            Eliminates foobar2000's non-compliant so-out-o-spec tagging scheme
-  --manualAtomRemove "some.atom.path" where some.atom.path can be:
-      keys to using manualAtomRemove:
-         ilst.ATOM.data or ilst.ATOM target an iTunes-style metadata tag
-         ATOM:lang=foo               target an atom with this language setting; like 3gp assets
-         ATOM.----.name:[foo]        target a reverseDNS metadata tag; like iTunNORM
-                                     Note: these atoms show up with 'AP -t' as: Atom "----" [foo]
-                                         'foo' is actually carried on the 'name' atom
-         ATOM[x]                     target an atom with an index other than 1; like trak[2]
-         ATOM.uuid=hex-hex-hex-hex   targt a uuid atom with the uuid of hex string representation
-    examples:
-        moov.udta.meta.ilst.----.name:[iTunNORM]      moov.trak[3].cprt:lang=urd
-        moov.trak[2].uuid=55534d54-21d2-4fce-bb88-695cfac9c740
-------------------------------------------------------------------------------------------------
-                   Environmental Variables (affecting picture placement) (macOS ONLY)
-
-  set PIC_OPTIONS in your shell to set these flags; preferences are separated by colons (:)
-
- MaxDimensions=num (default: 0; unlimited); sets maximum pixel dimensions
- DPI=num           (default: 72); sets dpi
- MaxKBytes=num     (default: 0; unlimited);  maximum kilobytes for file (jpeg only)
- AddBothPix=bool   (default: false); add original & converted pic (for archival purposes)
- AllPixJPEG | AllPixPNG =bool (default: false); force conversion to a specific picture format
- SquareUp          (include to square images to largest dimension, allows an [ugly] 160x1200->1200x1200)
- removeTempPix     (include to delete temp pic files created when resizing images after tagging)
- ForceHeight=num   (must also specify width, below) force image pixel height
- ForceWidth=num    (must also specify height, above) force image pixel width
-
- Examples: (bash-style)
- export PIC_OPTIONS="MaxDimensions=400:DPI=72:MaxKBytes=100:AddBothPix=true:AllPixJPEG=true"
- export PIC_OPTIONS="SquareUp:removeTempPix"
- export PIC_OPTIONS="ForceHeight=999:ForceWidth=333:removeTempPix"
-------------------------------------------------------------------------------------------------
-```
-
-```
-
-```

atomicparsley/install.ps1

@@ -1,60 +0,0 @@
-#!/usr/bin/env pwsh
-
-#########################
-# Install AtomicParsley #
-#########################
-
-# Every package should define these variables
-$pkg_cmd_name = "AtomicParsley"
-
-$pkg_dst_cmd = "$Env:USERPROFILE\.local\bin\AtomicParsley.exe"
-$pkg_dst_bin = "$Env:USERPROFILE\.local\bin"
-$pkg_dst = "$pkg_dst_cmd"
-
-$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\AtomicParsley-v$Env:WEBI_VERSION\bin\AtomicParsley.exe"
-$pkg_src_bin = "$Env:USERPROFILE\.local\opt\AtomicParsley-v$Env:WEBI_VERSION\bin"
-$pkg_src_dir = "$Env:USERPROFILE\.local\opt\AtomicParsley-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_cmd"
-
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-
-# Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Checking for (or Installing) MSVC Runtime..."
-    & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" vcruntime
-
-    Write-Output "Downloading AtomicParsley from $Env:WEBI_PKG_URL to $pkg_download"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
-}
-
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing AtomicParsley"
-
-    # TODO: create package-specific temp directory
-    # Enter tmp
-    Push-Location .local\tmp
-
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\AtomicParsley-v*" -Recurse -ErrorAction Ignore
-    Remove-Item -Path ".\AtomicParsley.exe" -Recurse -ErrorAction Ignore
-
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
-    & tar xf "$pkg_download"
-
-    # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
-    Move-Item -Path ".\AtomicParsley.exe" -Destination "$pkg_src_bin"
-
-    # Exit tmp
-    Pop-Location
-}
-
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
-New-Item "$pkg_dst_bin" -ItemType Directory -Force | Out-Null
-Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

atomicparsley/install.sh

@@ -1,41 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-__init_atomicparsley() {
-
-    #########################
-    # Install AtomicParsley #
-    #########################
-
-    WEBI_SINGLE=true
-
-    # Every package should define these 6 variables
-    pkg_cmd_name="AtomicParsley"
-
-    pkg_dst_cmd="$HOME/.local/bin/AtomicParsley"
-    pkg_dst="$pkg_dst_cmd"
-
-    pkg_src_cmd="$HOME/.local/opt/AtomicParsley-v$WEBI_VERSION/bin/AtomicParsley"
-    pkg_src_dir="$HOME/.local/opt/AtomicParsley-v$WEBI_VERSION"
-    pkg_src="$pkg_src_cmd"
-
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/AtomicParsley-v20221229.172126.0/bin
-        mkdir -p "$(dirname "$pkg_src_cmd")"
-
-        # mv ./AtomicParsley ~/.local/opt/AtomicParsley-v20221229.172126.0/bin/AtomicParsley
-        mv ./"$pkg_cmd_name" "$pkg_src_cmd"
-    }
-
-    pkg_get_current_version() {
-        # 'AtomicParsley --version' has output in this format:
-        #       AtomicParsley version: 20221229.172126.0 d813aa6e0304ed3ab6d92f1ae96cd52b586181ec (utf8)
-        # This trims it down to just the version number:
-        #       20221229.172126.0
-        AtomicParsley --version 2> /dev/null | head -n 1 | cut -d' ' -f3
-    }
-}
-
-__init_atomicparsley

atomicparsley/releases.js

@@ -1,74 +0,0 @@
-'use strict';
-
-var github = require('../_common/github.js');
-var owner = 'wez';
-var repo = 'atomicparsley';
-
-let targets = {
-  x86win: {
-    os: 'windows',
-    arch: 'x86',
-  },
-  x64win: {
-    os: 'windows',
-    arch: 'amd64',
-  },
-  x64mac: {
-    os: 'macos',
-    arch: 'amd64',
-  },
-  x64lin: {
-    os: 'linux',
-    arch: 'amd64',
-  },
-  x64musl: {
-    os: 'linux',
-    arch: 'amd64',
-    _musl_native: true,
-  },
-};
-
-module.exports = function (request) {
-  return github(request, owner, repo).then(function (all) {
-    for (let rel of all.releases) {
-      let windows32 = rel.name.includes('WindowsX86.');
-      if (windows32) {
-        Object.assign(rel, targets.x86win);
-        continue;
-      }
-
-      let windows64 = rel.name.includes('Windows.');
-      if (windows64) {
-        Object.assign(rel, targets.x64win);
-        continue;
-      }
-
-      let macos64 = rel.name.includes('MacOS');
-      if (macos64) {
-        Object.assign(rel, targets.x64mac);
-        continue;
-      }
-
-      let musl64 = rel.name.includes('Alpine');
-      if (musl64) {
-        Object.assign(rel, targets.x64musl);
-        continue;
-      }
-
-      let lin64 = rel.name.includes('Linux.');
-      if (lin64) {
-        Object.assign(rel, targets.x64lin);
-        continue;
-      }
-    }
-    return all;
-  });
-};
-
-if (module === require.main) {
-  module.exports(require('@root/request')).then(function (all) {
-    all = require('../_webi/normalize.js')(all);
-    console.info(JSON.stringify(all));
-    //console.info(JSON.stringify(all, null, 2));
-  });
-}

awless/README.md

@@ -7,23 +7,12 @@ tagline: |
 
 To update or switch versions, run `webi awless@stable` (or `@v2`, `@beta`, etc).
 
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/awless
-~/.aws/credentials
-```
-
 ## Cheat Sheet
 
 awless is modeled after popular command-line tools such as Git. Most commands
 are in the form of:
 
-```sh
+```bash
 awless verb [entity] [parameter=value ...]
 ```
 
@@ -37,13 +26,13 @@ Unlike the standard awscli tools, `awless` aims to be more human readable.
 
 For instance, let's list some resources:
 
-```sh
+```bash
 awless list vpcs
 ```
 
 Which outputs a friendly human readable table!
 
-```sh
+```bash
 |         ID ▲          | NAME | DEFAULT |   STATE   |     CIDR      |
 |-----------------------|------|---------|-----------|---------------|
 | vpc-00fd208a070000000 |      | false   | available | 172.16.0.0/16 |
@@ -53,13 +42,13 @@ Which outputs a friendly human readable table!
 There's also filter capabilities, in case the list is long. For example, let's
 list all EC2 instances with "api" in the name:
 
-```sh
+```bash
 awless list instances --filter name=api
 ```
 
 In addition to the default table output, there's also csv, tsv, json.
 
-```sh
+```bash
 awless list loadbalancers --format csv
 ```
 
@@ -67,7 +56,7 @@ awless list loadbalancers --format csv
 
 awless allows specifying things by name rather than ID by using the `@` prefix.
 
-```sh
+```bash
 awless create subnet cidr=10.0.0.0/24 vpc=@wordpress-vpc name=wordpress-public-subnet
 ```
 
@@ -76,13 +65,13 @@ awless create subnet cidr=10.0.0.0/24 vpc=@wordpress-vpc name=wordpress-public-s
 If you leave out a parameter, awless will prompt you for the missing
 information.
 
-```sh
+```bash
 awless delete i-123456789000abcd
 ```
 
 It will correctly detect what you were probably trying to do:
 
-```sh
+```bash
 Did you mean `awless delete instance ids=i-051fcef0537a53eb0` ?  [Y/n]
 ```
 

awless/install.ps1

@@ -16,22 +16,22 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\awless-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\awless-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading awless from $Env:WEBI_PKG_URL to $pkg_download"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE")) {
+    # TODO: arch detection
+    echo "Downloading awless from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
+    & move "$pkg_download.part" "$pkg_download"
 }
 
 IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing awless"
+    echo "Installing awless"
 
     # TODO: create package-specific temp directory
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
     # Remove any leftover tmp cruft
     Remove-Item -Path ".\awless-v*" -Recurse -ErrorAction Ignore
@@ -39,19 +39,19 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) {
 
     # Unpack archive file into this temporary directory
     # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
+    echo "Unpacking $pkg_download"
     & tar xf "$pkg_download"
 
     # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
+    echo "Install Location: $pkg_src_cmd"
+    New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
     Move-Item -Path ".\awless.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
-New-Item "$pkg_dst_bin" -ItemType Directory -Force | Out-Null
+echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
+New-Item "$pkg_dst_bin" -ItemType Directory -Force | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

awless/install.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # "This is too simple" you say! "Where is the magic!?" you ask.
 # There is no magic!
@@ -19,7 +19,7 @@ pkg_get_current_version() {
     #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
     # This trims it down to just the version number:
     #       2.1.0
-    awless version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::'
+    echo "$(awless version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')"
 }
 
 pkg_install() {

bat/README.md

@@ -5,56 +5,39 @@ tagline: |
   bat: A cat(1) clone with syntax highlighting and Git integration.
 ---
 
-To update or switch versions, run `webi bat@stable` (or `@v0.18`, `@beta`, etc).
+## Updating `bat`
 
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.config/bat/config
-~/.local/opt/bat/
+```bash
+webi bat@stable
 ```
 
-**Windows Users**
-
-```text
-\Windows\System32\vcruntime140.dll
-```
-
-This will also attempt to install the
-[Microsoft Visual C++ Redistributable](/vcruntime) via `webi vcruntime`. If it
-fails and you get the error _`vcruntime140.dll` was not found_, you'll need to
-[install it manually](https://learn.microsoft.com/en-US/cpp/windows/latest-supported-vc-redist?view=msvc-170).
+Use the `@beta` tag for pre-releases.
 
 ## Cheat Sheet
 
 > `bat` is pretty much what `cat` would be if it were developed today's in the
 > world of Markdown, git, etc.
 
+### How to run on Windows 10
+
+On Windows 10 you'll get an error like this:
+
+> execution cannot proceed run because vcruntime140.dll was not found
+
+You need to download and install the
+[Microsoft Visual C++ Redistributable](https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads)
+
 ### How to alias as `cat`
 
-Use [aliasman](/aliasman):
+Update your `.bashrc`, `.zshrc`, or `.profile`
 
-```sh
-aliasman cat 'bat --style=plain'
-alias cat='bat --style=plain'
-```
-
-Or place this in `~/.config/envman/alias.env` and manually update your
-`.bashrc`, `.zshrc`, `.profile`, and/or `~/.config/fish/config.fish` to source
-it.
-
-```sh
+```bash
 alias cat="bat --style=plain"
 ```
 
-For situations in which you must use `cat` exactly, remember that you can escape
-the alias:
+For situations in which you must use `cat` exactly, remember that you can escape the alias:
 
-```sh
+```bash
 \cat foo
 ```
 
@@ -62,13 +45,13 @@ the alias:
 
 Take a look at the config options:
 
-```sh
+```bash
 bat --help
 ```
 
 Check to see where your config file is:
 
-```sh
+```bash
 echo 'N' | bat --generate-config-file
 ```
 
@@ -76,7 +59,7 @@ Edit the config file:
 
 `~/.config/bat/config`:
 
-```text
+```txt
 # no numbers or headers, just highlighting and such
 --style="plain"
 ```

bat/install.ps1

@@ -3,45 +3,42 @@
 $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe"
 $EXENAME = "$Env:PKG_NAME.exe"
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part"
-    & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part"
+    & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 }
 
-# Fetch MSVC Runtime
-Write-Output "Checking for MSVC Runtime..."
-IF (-not (Test-Path "\Windows\System32\vcruntime140.dll")) {
-    & "$Env:USERPROFILE\.local\bin\webi-pwsh.ps1" vcruntime
-}
-
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
-    Write-Output "Installing $Env:PKG_NAME"
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME"))
+{
+    echo "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
+        # Remove any leftover tmp cruft
+        Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
 
-    # Unpack archive
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    # Move single binary into root of temporary folder
-    & Move-Item "bat-*\$EXENAME" "$VERNAME"
+        # Unpack archive
+        # Windows BSD-tar handles zip. Imagine that.
+        echo "Unpacking $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+        & tar xf "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+        # Move single binary into root of temporary folder
+        & move "bat-*\$EXENAME" "$VERNAME"
 
 
-    # Settle unpacked archive into place
-    Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
+        # Settle unpacked archive into place
+        echo "New Name: $VERNAME"
+        echo "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+        Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
+echo "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
 Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

bat/install.sh

@@ -1,8 +1,8 @@
-#!/bin/sh
-set -e
-set -u
+#!/bin/bash
 
-__init_bat() {
+{
+    set -e
+    set -u
 
     ###############
     # Install bat #
@@ -15,7 +15,7 @@ __init_bat() {
         #       bat 0.15.4
         # This trims it down to just the version number:
         #       0.15.4
-        bat --version 2> /dev/null | head -n 1 | cut -d' ' -f 2
+        echo $(bat --version 2> /dev/null | head -n 1 | cut -d' ' -f 2)
     }
 
     pkg_install() {
@@ -27,12 +27,5 @@ __init_bat() {
 
         # chmod a+x ~/.local/opt/bat-v0.15.4/bin/bat
         chmod a+x "$pkg_src_cmd"
-
-        if ! [ -e ~/.config/bat/config ]; then
-            mkdir -p ~/.config/bat/
-            touch ~/.config/bat/config
-        fi
     }
 }
-
-__init_bat

beyond-shell/README.md

@@ -1,83 +0,0 @@
----
-title: beyond-shell
-homepage: https://webinstall.dev/beyond-shell
-tagline: |
-  meta package for Beyond Code workshops
----
-
-To update, run the relevant installers individually. For example:
-`webi node@lts`.
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/bin
-~/.config/envman/alias.env
-~/.config/envman/PATH.env
-~/.iterm2/
-~/.local/bin/
-~/.local/opt/
-~/.local/share/font/ (or ~/Library/Fonts)
-~/.vim/pack/plugins/start/
-~/.vim/plugins/
-~/.vimrc
-```
-
-## Cheat Sheet
-
-> Installs the format and linter tools and code you'll need for the Beyond Code
-> Shell Scripting Workshop
-
-This meta package will install the full set of plugins and settings we
-recommended.
-
-## Prerequisites for Windows
-
-- https://webinstall.dev/wsl
-- https://webinstall.dev/nerdfont
-
-## Post Install for macOS
-
-- https://webinstall.dev/iterm2-themes
-- https://webinstall.dev/nerdfont
-
-## What's installed?
-
-- Formatters & Linters
-  - [`prettier`](/prettier)
-  - [`shellcheck`](/shellcheck)
-  - [`shfmt`](/shfmt)
-- Vim Plugins & Config
-  - [vim-leader](/vim-leader)
-  - [vim-shell](/vim-shell)
-  - [vim-sensible](/vim-sensible)
-  - [vim-viminfo](/vim-viminfo)
-  - [vim-lastplace](/vim-lastplace)
-  - [vim-smartcase](/vim-smartcase)
-  - [vim-spell](/vim-spell)
-  - [vim-ale](/vim-ale)
-  - [vim-prettier](/vim-prettier)
-  - [vim-shfmt](/vim-shfmt)
-  - [vim-whitespace](/vim-whitespace)
-- Commandline Tools
-  - [`aliasman`](/aliasman)
-  - [`bat`](/bat)
-  - [`curlie`](/curlie)
-  - [`jq`](/jq)
-  - [`pathman`](/pathman)
-  - [`ssh-pubkey`](/ssh-pubkey)
-  - [`webi`](/webi)
-- Aliases
-  - `cat='bat --style=plain --pager=none'`
-  - `curl=curlie`
-  - `setalias='aliasman'`
-- System
-  - [iterm2](/iterm2)
-  - [fish](/fish)
-  - [NerdFont](/nerdfont)
-  - git
-  - vim
-  - zip

beyond-shell/install.sh

@@ -1,415 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-webi_cmd="$HOME/.local/bin/webi"
-aliasman_cmd="$HOME/.local/bin/aliasman"
-pathman_cmd="$HOME/.local/bin/pathman"
-
-my_date="$(
-    date -u '+%F_%H.%M.%S'
-)"
-my_log="${HOME}/.local/share/beyond-code/var/${my_date}.log"
-
-fn_node_version() { (
-    my_node="${1:-}"
-
-    if test -n "${my_node}"; then
-        "${my_node}" --version | sed 's/v//'
-    fi
-); }
-
-fn_node_path() { (
-    if command -v node; then
-        return 0
-    fi
-
-    if test ! -e ~/.local/opt/node/bin/node; then
-        return 0
-    fi
-
-    echo ~/.local/opt/node/bin/node
-); }
-
-fn_node_install() { (
-    node_minimum="18"
-
-    my_path_actual="$(
-        fn_node_path
-    )"
-    my_node="$(
-        fn_node_path
-    )"
-    my_node_version="$(
-        fn_node_version "${my_node}"
-    )"
-
-    if test -n "${my_path_actual}"; then
-        my_bin_dir="$(
-            dirname "${my_node}"
-        )"
-        my_node_dir="$(
-            dirname "${my_bin_dir}"
-        )"
-        my_lib_dir="${my_node_dir}/lib/node_modules"
-        if test ! -w "${my_bin_dir}" ||
-            test ! -w "${my_node_dir}" ||
-            test ! -w "${my_lib_dir}"; then
-            printf "\e[31m[Warning]\e[0m \e[32mNode.js\e[0m at %s is not user-writable\n" "${my_path_actual}"
-            sleep 1
-
-            my_path_actual=""
-        fi
-    fi
-
-    if test -n "${my_path_actual}"; then
-        my_node_major="$(
-            echo "${my_node_version}" | cut -d'.' -f1
-        )"
-        if test -z "${my_node_major}"; then
-            my_path_actual=""
-        elif test "${my_node_major}" -lt "${node_minimum}"; then
-
-            printf "\e[31m[Warning]\e[0m \e[32mNode.js v%s\e[0m is too old\n" "${my_node_version}"
-            sleep 1
-
-            my_path_actual=""
-        fi
-    fi
-
-    if test -z "${my_path_actual}"; then
-        printf "\e[32m[Fixup]\e[0m Installing \e[32mNode.js\e[0m to \e[34m%s\e[0m\n" '~'/.local/opt/node/
-        sleep 1
-
-        "${webi_cmd}" node@lts >> "${my_log}"
-        if test -e ~/.local/opt/node/bin/node; then
-            "${pathman_cmd}" add ~/.local/opt/node/bin/ > /dev/null 2> /dev/null
-        fi
-    else
-        echo "[Info] Found ${my_path_actual}/node (v${my_node_version})"
-    fi
-); }
-
-fn_git_install() { (
-    if [ "Darwin" = "$(uname -s)" ]; then
-        needs_xcode="$(
-            /usr/bin/xcode-select -p > /dev/null 2> /dev/null || echo "true"
-        )"
-        if [ -n "${needs_xcode}" ]; then
-            echo ""
-            echo ""
-            printf "\e[31m[Error]\e[0m: Run this command to install XCode Command Line Tools first:\n"
-            echo ""
-            echo "    xcode-select --install"
-            echo ""
-            echo "After the install, close this terminal, open a new one, and try again."
-            echo ""
-            exit 1
-        else
-            my_git="$(command -v git)"
-            echo "[Info] Found ${my_git}"
-        fi
-        return 0
-    fi
-
-    if ! command -v git > /dev/null; then
-        fn_apt_get git git
-        return 0
-    fi
-
-    my_git="$(command -v git)"
-    echo "[Info] Found ${my_git}"
-); }
-
-fn_apt_get() { (
-    my_cmd="${1:-}"
-    my_pkg="${2:-}"
-
-    printf "\e[31m[Warning]\e[0m \e[32m%s\e[0m not found\n" "${my_cmd}"
-
-    printf "\e[32m[Fixup]\e[0m install \e[34m%s\e[0m (may require password)\n" "${my_pkg}"
-    sleep 1
-
-    echo "sudo apt-get install ${my_pkg}"
-
-    # shellcheck disable=SC2030
-    export DEBIAN_FRONTEND=noninteractive
-    if ! sudo apt-get install -qq -y -o=Dpkg::Use-Pty=0 "${my_pkg}"; then
-        echo "failed to install ${my_cmd} on"
-        cat /etc/issue
-    fi
-); }
-
-fn_vim_install() { (
-    if command -v vim > /dev/null; then
-        my_vim="$(command -v vim)"
-        echo "[Info] Found ${my_vim}"
-        return 0
-    fi
-    fn_apt_get vim vim
-); }
-
-fn_zip_install() { (
-    if command -v zip > /dev/null; then
-        my_zip="$(command -v zip)"
-        echo "[Info] Found ${my_zip}"
-        return 0
-    fi
-    fn_apt_get zip zip
-); }
-
-fn_fish_install() { (
-    if ! command -v fish > /dev/null; then
-        if [ "Darwin" = "$(uname -s)" ]; then
-            printf "\e[31m[Warning]\e[0m \e[32mfish\e[0m not found\n"
-
-            printf "\e[32m[Fixup]\e[0m install \e[34mfish\e[0m\n"
-            sleep 1
-
-            "${webi_cmd}" fish > /dev/null
-        else
-            fn_apt_get fish fish
-        fi
-    fi
-
-    if ! test -f ~/.config/fish/config.fish; then
-        printf "\e[32m[Fixup]\e[0m create \e[34m%s\e[0m\n" '~'/.config/fish/config.fish
-        mkdir -p ~/.config/fish/
-        touch ~/.config/fish/config.fish
-        chmod 0600 ~/.config/fish/config.fish
-    fi
-); }
-
-fn_touch() { (
-    my_file_path="${1:-}"
-    my_file_name="${2:-}"
-
-    if test -f "${my_file_path}"; then
-        echo "[Info] Found ${my_file_name}"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m create \e[34m%s\e[0m\n" "${my_file_name}"
-    my_base_path="$(
-        basename "${my_file_path}"
-    )"
-
-    if test ! -e "${my_base_path}"; then
-        mkdir -p "${my_base_path}"
-        chmod 0700 "${my_base_path}"
-    fi
-
-    touch "${my_file_path}"
-    chmod 0600 "${my_file_path}"
-); }
-
-fn_mkdir() { (
-    my_dir_name="${1:-}"
-    my_dir_path="${2:-}"
-    if test -d "${my_dir_path}"; then
-        echo "[Info] Found ${my_dir_name}"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m create \e[34m%s\e[0m\n" "${my_dir_name}"
-    mkdir -p "${my_dir_path}"
-    chmod 0700 "${my_dir_path}"
-); }
-
-fn_path_bin() { (
-    if test -d ~/bin/; then
-        echo "[Info] Found ~/bin/"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m create \e[34m%s\e[0m\n" '~'/bin/
-    mkdir -p ~/bin/
-    "${pathman_cmd}" add ~/bin/ > /dev/null 2> /dev/null
-); }
-
-fn_webi_bin() { (
-    my_cmd="$(
-        echo "${1:-}" | sed 's/@.*//'
-    )"
-
-    if test -e ~/.local/bin/"${my_cmd}"; then
-        echo "[Info] Found ~/.local/bin/${my_cmd}"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s\e[0m\n" "${my_cmd}" '~'"/.local/bin/${my_cmd}"
-
-    "${webi_cmd}" "${my_cmd}" > /dev/null 2> /dev/null
-); }
-
-fn_webi_opt() { (
-    my_cmd="${1:-}"
-
-    # shellcheck disable=SC2010
-    # we do want to use ls with grep
-    if ls ~/.local/opt/ | grep -q -E "^${my_cmd}(-|\$)"; then
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s/\e[0m\n" "${my_cmd}" '~'"/.local/opt/${my_cmd}"
-
-    "${webi_cmd}" "${my_cmd}" > /dev/null
-); }
-
-fn_webi_vim_config() { (
-    my_cmd="${1:-}"
-
-    if test -e ~/.vim/plugins/"${my_cmd}.vim"; then
-        echo "[Info] Found ~/.vim/plugins/${my_cmd}.vim"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s.vim\e[0m\n" "vim-${my_cmd}" '~'"/.vim/plugins/${my_cmd}.vim"
-
-    "${webi_cmd}" "vim-${my_cmd}" > /dev/null
-); }
-
-fn_webi_vim_plugin_ale() { (
-    my_cmd="ale"
-
-    if test -e ~/.vim/pack/plugins/start/"${my_cmd}"; then
-        echo "[Info] Found ~/.vim/pack/plugins/start/${my_cmd}"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s\e[0m\n" "vim-${my_cmd}" '~'"/.vim/pack/plugins/start/${my_cmd}"
-    printf "\e[32m[Fixup]\e[0m     and config at \e[34m%s.vim\e[0m\n" '~'"/.vim/plugins/${my_cmd}"
-
-    "${webi_cmd}" "vim-${my_cmd}" > /dev/null 2> /dev/null
-); }
-
-fn_webi_vim_plugin() { (
-    my_cmd="${1:-}"
-
-    if test -e ~/.vim/pack/plugins/start/"vim-${my_cmd}"; then
-        echo "[Info] Found ~/.vim/pack/plugins/start/vim-${my_cmd}"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s\e[0m\n" "vim-${my_cmd}" '~'"/.vim/pack/plugins/start/vim-${my_cmd}"
-    printf "\e[32m[Fixup]\e[0m     and config at \e[34m%s.vim\e[0m\n" '~'"/.vim/plugins/${my_cmd}"
-
-    "${webi_cmd}" "vim-${my_cmd}" > /dev/null 2> /dev/null
-); }
-
-fn_webi_vimrc() { (
-    my_cmd="${1:-}"
-
-    if grep -q "${my_cmd}" ~/.vimrc; then
-        echo "[Info] Found vim-${my_cmd} config in ~/.vimrc"
-        return 0
-    fi
-
-    printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m to \e[34m%s\e[0m\n" "vim-${my_cmd}" '~'/.vimrc
-
-    "${webi_cmd}" "vim-${my_cmd}" > /dev/null
-); }
-
-fn_setalias() { (
-    my_name="${1:-}"
-    my_cmd="${2:-}"
-
-    if grep -q "${my_name}" ~/.config/envman/alias.env; then
-        echo "[Info] Found '${my_name}' alias"
-        return 0
-    fi
-
-    printf "\e[32m%s\e[0m aliased to '\e[34m%s\e[0m'\n" "${my_name}" "${my_cmd}"
-
-    "${aliasman_cmd}" "${my_name}" "${my_cmd}" > /dev/null
-); }
-
-__install() {
-    #printf "\e[31mRED\e[0m\n"
-    #printf "\e[32mYELLOW\e[0m\n"
-    #printf "\e[34mBLUE\e[0m\n"
-
-    echo ""
-    printf "\e[34mLog\e[0m will be written to \e[32m%s\e[0m\n" '~'/.local/share/beyond-code/var/
-    sleep 2
-
-    echo ""
-    mkdir -p ~/.local/share/beyond-code/var/
-    mkdir -p ~/.local/opt/
-    {
-        printf "\e[32mwebi\e[0m at \e[32m%s\e[0m\n" '~'/.local/bin/webi
-        echo ""
-
-        if [ "Darwin" = "$(uname -s)" ]; then
-            if test -e /Applications/iTerm.app; then
-                echo "[Info] Found iTerm.app in /Applications/"
-            else
-                printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m into \e[34m%s\e[0m\n" "iTerm.app" "/Applications/"
-                "${webi_cmd}" iterm2 > /dev/null
-            fi
-        fi
-
-        fn_git_install
-        fn_fish_install
-        fn_zip_install
-
-        if test -e ~/.local/share/fonts/'Droid Sans Mono for Powerline Nerd Font Complete.otf'; then
-            echo "[Info] Found NerdFont in ~/.local/share/fonts"
-        elif test -e ~/Library/Fonts/'Droid Sans Mono for Powerline Nerd Font Complete.otf'; then
-            echo "[Info] Found NerdFont in ~/Library/Fonts"
-        else
-            "${webi_cmd}" nerdfont | tail -n 1
-        fi
-
-        if test -e ~/.iterm2/; then
-            echo "[Info] Found iTerm2 utils ~/.iterm2/"
-        else
-            printf "\e[32m[Fixup]\e[0m Installing \e[32m%s\e[0m into \e[34m%s\e[0m\n" "iterm2-utils" '~'"/.iterm2/"
-            "${webi_cmd}" iterm2-utils > /dev/null
-        fi
-
-        echo ""
-        echo "[Info] PATH updates in ~/.config/envman/PATH.env"
-        fn_path_bin
-        fn_touch ~/.config/envman/alias.env '~'/.config/envman/alias.env
-        fn_touch ~/.config/envman/PATH.env '~'/.config/envman/PATH.env
-
-        echo ""
-        fn_node_install
-        for my_cmd in aliasman bat curlie jq pathman ssh-pubkey; do
-            fn_webi_bin "${my_cmd}"
-        done
-
-        echo ""
-        echo "[Info] Aliases in ~/.config/envman/alias.env"
-        fn_setalias setalias 'aliasman'
-        fn_setalias cat 'bat --style=plain --pager=none'
-        fn_setalias curl 'curlie'
-
-        # vim config and plugins
-        echo ""
-        fn_vim_install
-        fn_touch ~/.vimrc '~'/.vimrc
-        for my_plugin in leader shell; do
-            fn_webi_vimrc "${my_plugin}"
-        done
-        fn_webi_vim_plugin sensible
-        for my_plugin in viminfo smartcase spell whitespace; do
-            fn_webi_vim_config "${my_plugin}"
-        done
-        fn_webi_vim_plugin_ale
-        for my_plugin in commentary lastplace shfmt prettier; do
-            fn_webi_vim_plugin "${my_plugin}"
-        done
-        for my_cmd in shfmt@3.5 shellcheck; do
-            fn_webi_bin "${my_cmd}"
-        done
-
-    } | tee -a "${my_log}"
-
-    echo ""
-    printf "\e[34mLog\e[0m written to \e[32m%s\e[0m\n" "${my_log}"
-    echo ""
-}
-
-__install

brew/README.md

@@ -5,24 +5,13 @@ tagline: |
   Brew: The Missing Package Manager for macOS (and Linux).
 ---
 
-To update or switch versions, use brew's built-in upgrade management, or our
-handy update service script:
+## Updating `brew`
 
-```sh
+`brew` has its own built-in upgrade management.
+
+```bash
 brew update
 brew upgrade
-brew-update-service-install # Webi helper script
-```
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/opt/brew/
-~/.local/bin/brew-update-service-install
 ```
 
 ## Cheat Sheet
@@ -37,27 +26,27 @@ way, report it to brew.
 
 ### How to install CLI packages
 
-```sh
+```bash
 brew update
 brew install node
 ```
 
 ### How to install GUI packages
 
-```sh
+```bash
 brew update
 brew cask install docker
 ```
 
 ### Where are things installed?
 
-```sh
+```bash
 ~/.local/opt/brew/
 ```
 
 For reference, traditional `brew` installs here:
 
-```sh
+```bash
 /usr/local/Cellar/
 /opt/homebrew-cask/Caskroom/
 ```
@@ -69,7 +58,7 @@ like `brew upgrade` or `brew update python`, and your whole system gets borked.
 
 If you need to _uninstall_ and _reinstall_ local brew:
 
-```sh
+```bash
 rm -rf ~/.local/opt/brew
 webi brew
 ```
@@ -78,12 +67,12 @@ If you need to _uninstall_ global brew:
 
 For _Mojave_, _Catalina_, _Big Sur_, and above:
 
-```sh
+```bash
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall.sh)"
 ```
 
 For _High Sierra_ and below:
 
-```sh
+```bash
 /bin/bash -c ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)"
 ```

brew/brew-update-service-install

@@ -1,47 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-main() { (
-    sed '1,/^#~\/.local\/bin\/brew-updater/d' "${0}" > ~/.local/bin/brew-update-hourly
-    chmod a+x ~/.local/bin/brew-update-hourly
-
-    env PATH="$PATH" serviceman add --user \
-        --name sh.brew.updater -- \
-        ~/.local/bin/brew-update-hourly
-); }
-
-if main; then
-    exit 0
-fi
-
-#~/.local/bin/brew-updater
-#!/bin/sh
-#set -e
-set -u
-
-if test -e ~/.config/envman/PATH.env; then
-    # shellcheck disable=SC1090
-    . ~/.config/envman/PATH.env
-fi
-
-while true; do
-    my_start="$(date '+%s')"
-
-    my_date="$(date '+%F %T')"
-    echo "[$my_date] Updating brew..."
-    brew update
-    echo ''
-
-    my_end="$(date '+%s')"
-    my_elapsed="$((my_end - my_start))"
-    my_date="$(date '+%F %T')"
-    echo "[$my_date] Updated in ${my_elapsed}s."
-
-    echo "[$my_date] Cleaning up..."
-    brew cleanup
-
-    echo "[$my_date] Waiting 24 hours..."
-    my_wait="$((24 * 60 * 60))"
-    sleep "$my_wait"
-done

brew/install.sh

@@ -1,15 +1,15 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 set -u
 
-_install_brew() {
+function _install_brew() {
     # Straight from https://brew.sh
     #/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
 
-    if test "Darwin" = "$(uname -s)"; then
+    if [[ -n "$(uname -a | grep -i darwin)" ]]; then
         needs_xcode="$(/usr/bin/xcode-select -p > /dev/null 2> /dev/null || echo "true")"
-        if test -n "${needs_xcode}"; then
+        if [[ -n ${needs_xcode} ]]; then
             echo ""
             echo ""
             echo "ERROR: Run this command to install XCode Command Line Tools first:"
@@ -20,11 +20,11 @@ _install_brew() {
             echo ""
         fi
     else
-        if ! command -v gcc > /dev/null; then
+        if [ -z "$(command -v gcc)" ]; then
             echo >&2 "Warning: to install 'gcc' et al on Linux use the built-in package manager."
             echo >&2 "       For example, try: sudo apt install -y build-essential"
         fi
-        if ! command -v git > /dev/null; then
+        if [ -z "$(command -v git)" ]; then
             echo >&2 "Error: to install 'git' on Linux use the built-in package manager."
             echo >&2 "       For example, try: sudo apt install -y git"
             exit 1
@@ -32,25 +32,17 @@ _install_brew() {
     fi
 
     # From Straight from https://brew.sh
-    if ! test -d "$HOME/.local/opt/brew"; then
+    if ! [ -d "$HOME/.local/opt/brew" ]; then
         echo "Installing to '$HOME/.local/opt/brew'"
         echo ""
         echo "If you prefer to have brew installed to '/usr/local' cancel now and do the following:"
         echo "        rm -rf '$HOME/.local/opt/brew'"
-        # shellcheck disable=2016
         echo '        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
         echo ""
         sleep 3
         git clone --depth=1 https://github.com/Homebrew/brew "$HOME/.local/opt/brew"
     fi
 
-    rm -rf "$HOME/.local/bin/brew-update-service-install"
-    webi_download \
-        "$WEBI_HOST/packages/brew/brew-update-service-install" \
-        "$HOME/.local/bin/brew-update-service-install" \
-        brew-update-service-install
-    chmod a+x "$HOME/.local/bin/brew-update-service-install"
-
     webi_path_add "$HOME/.local/opt/brew/bin"
     export PATH="$HOME/.local/opt/brew/bin:$PATH"
 
@@ -64,13 +56,8 @@ _install_brew() {
     echo ""
     echo "If you prefer to have brew installed to '/usr/local' do the following:"
     echo "        mv '$HOME/.local/opt/brew' '$HOME/.local/opt/brew.$(date '+%F_%H-%M-%S').bak'"
-    # shellcheck disable=2016
     echo '        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"'
     echo ""
-
-    echo "To register 'brew update' as a hourly system service:"
-    echo "        brew-update-service-install"
-    echo ""
 }
 
 _install_brew

bun/README.md

@@ -1,160 +0,0 @@
----
-title: Bun
-homepage: https://bun.sh
-tagline: |
-  Bun is a fast all-in-one JavaScript runtime
----
-
-To update or switch versions, run `webi bun@<tag>`. \
-(you can use `@beta` for pre-releases, or `@x.y.z` for a specific version)
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/opt/bun/
-~/.local/opt/bun-<VERSION>/
-```
-
-## Cheat Sheet
-
-> Bun is a wicked-fast JavaScript runtime for developer tooling, API servers,
-> and edge computing.
->
-> It's built in Zig and provides a more curated, "batteries-included" approach
-> to developing with JavaScript and JavaScript-ish languages - such as
-> TypeScript, JSX, and TSX.
-
-Run some <strong><em>x</em></strong>Script:
-
-```sh
-bun run ./hello.js
-bun run ./hello.jsx
-bun run ./hello.ts
-bun run ./hello.tsx
-```
-
-Run a package from `npm`:
-
-```sh
-bun x jswt
-```
-
-More goodies:
-
-```
-bun help
-```
-
-(there's also a built-in **development server** and lots of stuff)
-
-### bun<span>.</span>sh/install vs webi
-
-Bun has an official installer:
-
-```sh
-export BUN_INSTALL="$HOME/.bun"
-curl -fsSL https://bun.sh/install | bash
-```
-
-You might want to still use webi if you want to be able to switch between
-versions.
-
-### How to install command line completions
-
-```sh
-bun completions
-```
-
-### How to create a bun executable
-
-1. Create your script
-   ```sh
-   vim ./hello
-   ```
-   ```js
-   #!/usr/bin/env bun
-   console.log('hello');
-   ```
-2. Make it executable
-   ```sh
-   chmod a+x ./hello
-   ```
-3. Run it
-   ```sh
-   ./hello
-   ```
-
-### How to publish bun packages
-
-At the time of this writing (bun v0.5.1), you'll still need to publish with
-`npm`.
-
-`npm` is installed with [node](/node).
-
-See
-[Getting Started with NPM (as a developer)](https://gist.github.com/coolaj86/1318304).
-
-### How to install bun packages
-
-You can run it with `bun x`:
-
-```sh
-bun x <whatever>
-```
-
-Or you can put the `#!/usr/bin/env bun` shebang before publishing, and install
-from npm:
-
-```sh
-bun install -g <whatever>
-<whatever>
-```
-
-### How to run a Bun program as a service
-
-As a system service on Linux:
-
-(**note**: swap 'my-project' and './my-project' for the name of your project and
-file)
-
-1. Install serviceman (compatible with systemd)
-   ```sh
-   webi serviceman
-   source ~/.config/envman/PATH.env
-   ```
-2. Go into your program's directory
-   ```sh
-   pushd ./my-project/
-   ```
-3. Add your project to the system launcher, running as the current user
-   ```sh
-   sudo env PATH="$PATH" \
-       serviceman add --path="$PATH" --system \
-           --username "$(whoami)" --name my-project -- \
-       bun run ./my-project.js
-   ```
-4. Restart the logging service
-   ```sh
-   sudo systemctl restart systemd-journald
-   ```
-
-For **macOS**:
-
-1. Install serviceman (compatible with `launchctl`)
-   ```sh
-   webi serviceman
-   source ~/.config/envman/PATH.env
-   ```
-2. Go into your program's directory
-   ```sh
-   pushd ./my-project/
-   ```
-3. Add your project to the system launcher, running as the current user
-   ```sh
-   serviceman add --path="$PATH" --user --name my-project -- \
-       bun run ./my-project.js
-   ```

bun/install.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-# NOTE: pkg_* variables can be defined here
-#       pkg_cmd_name
-#       pkg_src, pkg_src_bin, pkg_src_cmd
-#       pkg_dst, pkg_dst_bin, pkg_dst_cmd
-#
-# Their defaults are defined in _webi/template.sh at https://github.com/webinstall/packages
-
-# Every package should define these 6 variables
-pkg_cmd_name="bun"
-
-pkg_dst_cmd="$HOME/.local/opt/bun/bin/bun"
-pkg_dst_dir="$HOME/.local/opt/bun"
-pkg_dst="$pkg_dst_dir"
-
-pkg_src_cmd="$HOME/.local/opt/bun-v$WEBI_VERSION/bin/bun"
-pkg_src_dir="$HOME/.local/opt/bun-v$WEBI_VERSION"
-pkg_src="$pkg_src_dir"
-
-pkg_get_current_version() {
-    # 'bun --version' only outputs the version:
-    #       0.5.1
-    # But we future-proof it a little anyway
-    #       0.5.1
-    bun --version 2> /dev/null | head -n 1 | cut -d' ' -f1
-}
-
-# pkg_install must be defined by every package
-pkg_install() {
-    # ~/.local/opt/bun-v0.5.1/bin
-    mkdir -p "$(dirname "$pkg_src_cmd")"
-
-    # mv ./bun-*/bun ~/.local/opt/bun-v0.5.1/bin/bun
-    mv ./bun-*/bun* "$pkg_src_cmd"
-}

bun/releases.js

@@ -1,32 +0,0 @@
-'use strict';
-
-var github = require('../_common/github.js');
-var owner = 'oven-sh';
-var repo = 'bun';
-
-module.exports = function (request) {
-  return github(request, owner, repo).then(function (all) {
-    all.releases = all.releases
-      .filter(function (r) {
-        let isDebug = /-profile/.test(r.name);
-        if (!isDebug) {
-          return true;
-        }
-      })
-      .map(function (r) {
-        // bun-v0.5.1 => v0.5.1
-        r.version = r.version.replace(/bun-/g, '');
-        return r;
-      });
-    return all;
-  });
-};
-
-if (module === require.main) {
-  module.exports(require('@root/request')).then(function (all) {
-    all = require('../_webi/normalize.js')(all);
-    // just select the first 5 for demonstration
-    all.releases = all.releases.slice(0, 5);
-    console.info(JSON.stringify(all, null, 2));
-  });
-}

caddy/README.md

@@ -5,22 +5,14 @@ tagline: |
   Caddy is a fast, multi-platform web server with automatic HTTPS.
 ---
 
-To update or switch versions, run `webi caddy@stable` (or `@v2.4`, `@beta`,
-etc).
+## Updating `caddy`
 
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/caddy
-~/.config/caddy/autosave.json
-~/.local/share/caddy/certificates/
-<PROJECT-DIR>/Caddyfile
+```bash
+webi caddy@stable
 ```
 
+Use the `@beta` tag for pre-releases, or `@x.y.z` for a specific version.
+
 ## Cheat Sheet
 
 > Caddy makes it easy to use Let's Encrypt to handle HTTPS (TLS/SSL) and to
@@ -34,140 +26,64 @@ Here's the things we find most useful:
 - Running as a system service on
   - Linux
   - MacOS
-  - Windows
+  - Windows 10
 
 ### How to serve a directory
 
-```sh
+```bash
 caddy file-server --browse --listen :4040
 ```
 
-### How to serve HTTPS on localhost
-
-Caddy can be used to test with https on localhost.
-
-`Caddyfile`:
-
-```Caddyfile
-localhost {
-    handle /api/* {
-        reverse_proxy localhost:3000
-    }
-
-    handle /* {
-        root * ./public/
-        file_server
-    }
-}
-```
-
-```sh
-caddyfile run --config ./Caddyfile
-```
-
 ### How to redirect and reverse proxy
 
 Here's what a fairly basic `Caddyfile` looks like:
 
-`Caddyfile`:
-
-```Caddyfile
+```txt
 # redirect www to bare domain
 www.example.com {
     redir https://example.com{uri} permanent
 }
 
 example.com {
-    ###########
-    # Logging #
-    ###########
-
     # log to stdout, which is captured by journalctl
     log {
         output stdout
         format console
     }
 
-    ###############
-    # Compression #
-    ###############
-
     # turn on standard streaming compression
     encode gzip zstd
 
-    ####################
-    # Reverse Proxying #
-    ####################
-
     # reverse proxy /api to :3000
-    handle /api/* {
-        reverse_proxy localhost:3000
-    }
+    reverse_proxy /api/* localhost:3000
 
     # reverse proxy some "well known" APIs
-    handle /.well-known/openid-configuration {
-        reverse_proxy localhost:3000
-    }
-    handle /.well-known/jwks.json {
-        reverse_proxy  localhost:3000
-    }
+    reverse_proxy /.well-known/openid-configuration localhost:3000
+    reverse_proxy /.well-known/jwks.json localhost:3000
 
-    ##################
-    # Path Rewriting #
-    ##################
-
-    # reverse proxy and rewrite path /api/oldpath/* => /api/newpath/*
-    handle_path /api/oldpath/* {
-        rewrite * /api/newpath{path}
-        reverse_proxy localhost:3000
+    # serve static files from public folder, but not /api
+    @notApi {
+        file {
+            try_files {path} {path}/ {path}/index.html
+        }
+        not path /api/*
+        not path /.well-known/openid-configuration
+        not path /.well-known/jwks.json
     }
-
-    ###############
-    # File Server #
-    ###############
-
-    # serve static files
-    handle /* {
-        root * /srv/example.com/public/
-        file_server
+    route {
+      rewrite @notApi {http.matchers.file.relative}
     }
+    root * /srv/example.com/public/
+    file_server
 }
 ```
 
-```sh
-caddyfile run --config ./Caddyfile
-```
+And here's how you run caddy with it:
 
-- [`log`](https://caddyserver.com/docs/caddyfile/directives/log)
-- [`encode`](https://caddyserver.com/docs/caddyfile/directives/encode)
-- [`handle`](https://caddyserver.com/docs/caddyfile/directives/handle)
-- [`handle_path`](https://caddyserver.com/docs/caddyfile/directives/handle_path)
-- [`root`](https://caddyserver.com/docs/caddyfile/directives/root)
-- [`file_server`](https://caddyserver.com/docs/caddyfile/directives/file_server)
-
-### How to rewrite and reverse proxy
-
-```Caddyfile
-example.com {
-    # ...
-
-    # reverse proxy /api/new/ to http://localhost:3100/api/
-    handle_path /api/new/* {
-        rewrite * /api{path}
-        reverse_proxy localhost:3100
-    }
-}
-```
-
-### How to run caddy
-
-```sh
+```bash
 caddy run --config ./Caddyfile
 ```
 
-Note: `run` runs in the foreground, `start` starts a service (daemon) in the
-background.
-
 ### How to start Caddy as a Linux service
 
 Here are the 3 things you need to do to start Caddy as a system service:
@@ -183,7 +99,7 @@ Using a user named `app` to run your services is common industry convention.
 
 You can use `setcap` to allow Caddy to use privileged ports.
 
-```sh
+```bash
 sudo setcap cap_net_bind_service=+ep $(readlink -f $(command -v caddy))
 ```
 
@@ -194,13 +110,13 @@ start the appropriate systemd launcher for Linux.
 
 Install Serviceman with Webi:
 
-```sh
+```bash
 webi serviceman
 ```
 
 Use Serviceman to create a _systemd_ config file.
 
-```sh
+```bash
 sudo env PATH="$PATH" \
     serviceman add --system --username $(whoami) --name caddy -- \
         caddy run --config ./Caddyfile
@@ -209,7 +125,7 @@ sudo env PATH="$PATH" \
 This will create `/etc/systemd/system/caddy.service`, which can be managed with
 `systemctl`. For example:
 
-```sh
+```bash
 sudo systemctl restart caddy
 ```
 
@@ -226,13 +142,13 @@ start the appropriate service launcher file for MacOS.
 
 Install Serviceman with Webi:
 
-```sh
+```bash
 webi serviceman
 ```
 
 Use Serviceman to create a _launchd_ plist file.
 
-```sh
+```bash
 serviceman add --username $(whoami) --name caddy -- \
     caddy run --config ./Caddyfile
 ```
@@ -240,7 +156,7 @@ serviceman add --username $(whoami) --name caddy -- \
 This will create `~//Library/LaunchAgents/caddy.plist`, which can be managed
 with `launchctl`. For example:
 
-```sh
+```bash
 launchctl unload -w "$HOME/Library/LaunchAgents/caddy.plist"
 launchctl load -w "$HOME/Library/LaunchAgents/caddy.plist"
 ```
@@ -262,24 +178,24 @@ powershell.exe -WindowStyle Hidden -Command $r = Get-NetFirewallRule -DisplayNam
 **Startup Registry**
 
 You can use [Serviceman](https://webinstall.dev/serviceman) to create and start
-the appropriate service launcher for Windows.
+the appropriate service launcher for Windows 10.
 
 Install Serviceman with Webi:
 
-```sh
+```bash
 webi.bat serviceman
 ```
 
 Use Serviceman to create a Startup entry in the Windows Registry:
 
-```sh
+```bash
 serviceman.exe add --name caddy -- \
     caddy run --config ./Caddyfile
 ```
 
 You can manage the service directly with Serviceman. For example:
 
-```sh
+```bash
 serviceman stop caddy
 serviceman start caddy
 ```

caddy/install.ps1

@@ -16,22 +16,22 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\caddy-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\caddy-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading caddy from $Env:WEBI_PKG_URL to $pkg_download"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE")) {
+    # TODO: arch detection
+    echo "Downloading caddy from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
+    & move "$pkg_download.part" "$pkg_download"
 }
 
 IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing caddy"
+    echo "Installing caddy"
 
     # TODO: create package-specific temp directory
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
     # Remove any leftover tmp cruft
     Remove-Item -Path ".\caddy-v*" -Recurse -ErrorAction Ignore
@@ -39,19 +39,19 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) {
 
     # Unpack archive file into this temporary directory
     # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
+    echo "Unpacking $pkg_download"
     & tar xf "$pkg_download"
 
     # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
+    echo "Install Location: $pkg_src_cmd"
+    New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
     Move-Item -Path ".\caddy.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
-New-Item "$pkg_dst_bin" -ItemType Directory -Force | Out-Null
+echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
+New-Item "$pkg_dst_bin" -ItemType Directory -Force | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

caddy/install.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # "This is too simple" you say! "Where is the magic!?" you ask.
 # There is no magic!
@@ -19,7 +19,7 @@ pkg_get_current_version() {
     #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
     # This trims it down to just the version number:
     #       2.1.0
-    caddy version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::'
+    echo "$(caddy version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')"
 }
 
 pkg_install() {

chromedriver/README.md

@@ -24,7 +24,7 @@ Also, **Chrome must be installed first** in order for ChromeDriver to work.
 On Debian (and Ubuntu) Linux you should be able to install Chrome with `dpkg`
 and `apt`:
 
-```sh
+```bash
 wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
 sudo dpkg -i google-chrome-stable_current_amd64.deb
 sudo apt install -y google-chrome-stable
@@ -33,13 +33,13 @@ sudo apt --fix-broken install -y
 
 You may get an error like this:
 
-```text
+```txt
 chromedriver: error while loading shared libraries: libnss3.so: cannot open shared object file: No such file or directory
 ```
 
 If so, try installing `chromium-browser`:
 
-```sh
+```bash
 sudo apt install -y chromium-browser
 sudo apt --fix-broken install -y
 ```

chromedriver/install.ps1

@@ -15,44 +15,46 @@ $pkg_src_bin = "$Env:USERPROFILE\.local\opt\chromedriver-v$Env:WEBI_VERSION\bin"
 $pkg_src_dir = "$Env:USERPROFILE\.local\opt\chromedriver-v$Env:WEBI_VERSION"
 $pkg_src = "$pkg_src_cmd"
 
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+$pkg_download = "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading chromedriver from $Env:WEBI_PKG_URL to $pkg_download"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading chromedriver from $Env:WEBI_PKG_URL to $pkg_download"
     & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
+    & move "$pkg_download.part" "$pkg_download"
 }
 
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing chromedriver"
+IF (!(Test-Path -Path "$pkg_src_cmd"))
+{
+    echo "Installing chromedriver"
 
     # TODO: create package-specific temp directory
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\chromedriver.exe" -Recurse -ErrorAction Ignore
+        # Remove any leftover tmp cruft
+        Remove-Item -Path ".\chromedriver.exe" -Recurse -ErrorAction Ignore
 
-    # NOTE: DELETE THIS COMMENT IF NOT USED
-    # Move single binary into root of temporary folder
-    #& move "$pkg_download" "chromedriver.exe"
+        # NOTE: DELETE THIS COMMENT IF NOT USED
+        # Move single binary into root of temporary folder
+        #& move "$pkg_download" "chromedriver.exe"
 
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
-    & tar xf "$pkg_download"
+        # Unpack archive file into this temporary directory
+        # Windows BSD-tar handles zip. Imagine that.
+        echo "Unpacking $pkg_download"
+        & tar xf "$pkg_download"
 
-    # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force | Out-Null
-    Move-Item -Path ".\chromedriver-*\chromedriver.exe" -Destination "$pkg_src_bin"
+        # Settle unpacked archive into place
+        echo "Install Location: $pkg_src_cmd"
+        New-Item "$pkg_src_bin" -ItemType Directory -Force | out-null
+        Move-Item -Path ".\chromedriver-*\chromedriver.exe" -Destination "$pkg_src_bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
+echo "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
+Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | out-null
 Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

chromedriver/install.sh

@@ -1,8 +1,8 @@
-#!/bin/sh
-set -e
-set -u
+#!/bin/bash
 
-__init_chromedriver() {
+{
+    set -e
+    set -u
 
     ########################
     # Install chromedriver #
@@ -21,7 +21,7 @@ __init_chromedriver() {
     # pkg_install must be defined by every package
     pkg_install() {
         # ~/.local/opt/chromedriver-v88.0.4324.96/bin
-        mkdir -p "$(dirname "$pkg_src_cmd")"
+        mkdir -p "$(dirname $pkg_src_cmd)"
 
         # mv ./chromedriver-*/chromedriver ~/.local/opt/chromedriver-v88.0.4324.96/bin/chromedriver
         mv ./chromedriver* "$pkg_src_cmd"
@@ -33,9 +33,7 @@ __init_chromedriver() {
         #       ChromeDriver 88.0.4324.96 (68dba2d8a0b149a1d3afac56fa74648032bcf46b-refs/branch-heads/4324@{#1784})
         # This trims it down to just the version number:
         #       88.0.4324.96
-        chromedriver --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2
+        echo $(chromedriver --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2)
     }
 
 }
-
-__init_chromedriver

chromedriver/releases.js

@@ -6,20 +6,20 @@ var matchers = {
   metaGeneration: /.*MetaGeneration>(.*)<\/MetaGeneration.*/,
   lastModified: /.*LastModified>(.*)<\/LastModified.*/,
   etag: /.*ETag>(.*)<\/ETag.*/,
-  size: /.*Size>(.*)<\/Size.*/,
+  size: /.*Size>(.*)<\/Size.*/
 };
 var baseUrl = 'https://chromedriver.storage.googleapis.com';
 
 module.exports = function (request) {
   var all = {
     download: '',
-    releases: [],
+    releases: []
   };
 
   // XML
   return request({
     url: 'https://chromedriver.storage.googleapis.com/',
-    json: false,
+    json: false
   })
     .then(function (resp) {
       var body = resp.body;
@@ -32,7 +32,7 @@ module.exports = function (request) {
           key: group.replace(matchers.key, '$1'),
           //generation: group.replace(matchers.generation, '$1'),
           //metaGeneration: group.replace(matchers.metaGeneration, '$1'),
-          lastModified: group.replace(matchers.lastModified, '$1'),
+          lastModified: group.replace(matchers.lastModified, '$1')
           //etag: group.replace(matchers.etag, '$1'),
           //size: group.replace(matchers.size, '$1')
         };
@@ -66,7 +66,7 @@ module.exports = function (request) {
           os: osname,
           arch: arch,
           hash: '-', // not sure about including etag as hash yet
-          download: asset.key,
+          download: asset.key
         });
       });
     })

cmake/README.md

@@ -1,83 +0,0 @@
----
-title: CMake
-homepage: https://github.com/Kitware/CMake
-tagline: |
-  CMake is a cross-platform, open-source build system generator
----
-
-To update or switch versions, run `webi cmake@stable` (or `@v2`, `@beta`, etc).
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/cmake
-~/.local/opt/cmake
-```
-
-## Cheat Sheet
-
-> CMake is a cross-platform alternative to autoconf that works on Windows, Mac,
-> and Linux
-
-A project structure looks like this:
-
-```text
-my-project/
-├── build/
-├── CMakeLists.txt
-├── hello-world*
-└── hello-world.cpp
-```
-
-And can be built my running `cmake` from the `build` directory:
-
-```sh
-pushd ./build/
-cmake ../
-make
-```
-
-### How to create a Hello World with CMake
-
-Lets create a hello world program in C++ and build it with CMake.
-
-1. Create a project directory
-   ```sh
-   mkdir ./my-project/
-   pushd ./my-project/
-   ```
-2. Create a Hello World C++ file named `hello-world.cpp` `hello-world.cpp`:
-
-   ```cpp
-   #include <iostream>
-
-   int main(int argc, char** argv) {
-       std::cout << "Hello World!" << std::endl;
-       return 0;
-   }
-   ```
-
-3. Create a `CMakeLists.txt` to compile our code `CMakeLists.txt`:
-
-   ```cmake
-   project{hello-world}
-   cmake_minimum_required(VERSION 3.10)
-
-   add_executable(hello-world hello-world.cpp)
-   ```
-
-4. Create a build directory and build the binary
-   ```sh
-   mkdir ./build/
-   pushd ./build/
-   cmake ../
-   make
-   ```
-5. Test the built binary:
-   ```sh
-   ./hello-world
-   ```

cmake/install.ps1

@@ -1,54 +0,0 @@
-#!/usr/bin/env pwsh
-
-#################
-# Install cmake #
-#################
-
-# Every package should define these variables
-$pkg_cmd_name = "cmake"
-
-$pkg_dst_cmd = "$Env:USERPROFILE\.local\opt\cmake\bin\cmake.exe"
-$pkg_dst_dir = "$Env:USERPROFILE\.local\opt\cmake"
-$pkg_dst = "$pkg_dst_cmd"
-
-$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION\bin\cmake.exe"
-$pkg_src_bin = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION\bin"
-$pkg_src_dir = "$Env:USERPROFILE\.local\opt\cmake-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_cmd"
-
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-
-# Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading cmake from $Env:WEBI_PKG_URL to $pkg_download"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
-}
-
-IF (!(Test-Path -Path "$pkg_src_dir")) {
-    Write-Output "Installing cmake"
-
-    # TODO: create package-specific temp directory
-    # Enter tmp
-    Push-Location .local\tmp
-
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\cmake*" -Recurse -ErrorAction Ignore
-
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $pkg_download"
-    & tar xf "$pkg_download"
-
-    # Settle unpacked archive into place
-    Write-Output "Install Location: $pkg_src_cmd"
-    Move-Item -Path ".\cmake*" -Destination "$pkg_src_dir"
-
-    # Exit tmp
-    Pop-Location
-}
-
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore | Out-Null
-Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

cmake/install.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# shellcheck disable=SC2034
-# "'pkg_cmd_name' appears unused. Verify it or export it."
-
-__init_cmake() {
-    set -e
-    set -u
-
-    ##################
-    # Install cmake #
-    ##################
-
-    # Every package should define these 6 variables
-    pkg_cmd_name="cmake"
-
-    pkg_dst_cmd="$HOME/.local/opt/cmake/bin/cmake"
-    pkg_dst_dir="$HOME/.local/opt/cmake"
-    pkg_dst="$pkg_dst_dir"
-
-    pkg_src_cmd="$HOME/.local/opt/cmake-v$WEBI_VERSION/bin/cmake"
-    pkg_src_dir="$HOME/.local/opt/cmake-v$WEBI_VERSION"
-    pkg_src="$pkg_src_dir"
-
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/cmake-v3.27.0/
-        mkdir -p "$(dirname "${pkg_src_dir}")"
-
-        # mv ./cmake-*/ ~/.local/opt/cmake-v3.27.0/
-        mv ./cmake-*/ "${pkg_src_dir}"
-    }
-
-    # pkg_get_current_version is recommended, but not required
-    pkg_get_current_version() {
-        # 'cmake --version' has output in this format:
-        #       cmake 3.27.0 (rev abcdef0123)
-        # This trims it down to just the version number:
-        #       3.27.0
-        cmake --version 2> /dev/null |
-            head -n 1 |
-            cut -d ' ' -f 3
-    }
-
-}
-
-__init_cmake

cmake/releases.js

@@ -1,20 +0,0 @@
-'use strict';
-
-var github = require('../_common/github.js');
-var owner = 'Kitware';
-var repo = 'CMake';
-
-module.exports = function (request) {
-  return github(request, owner, repo).then(function (all) {
-    return all;
-  });
-};
-
-if (module === require.main) {
-  module.exports(require('@root/request')).then(function (all) {
-    all = require('../_webi/normalize.js')(all);
-    // just select the first 5 for demonstration
-    all.releases = all.releases.slice(0, 5);
-    console.info(JSON.stringify(all, null, 2));
-  });
-}

comrak/README.md

@@ -5,19 +5,11 @@ tagline: |
   Comrak is a Rust port of github's cmark-gfm.
 ---
 
-To update or switch versions, run `webi comrak@stable` (or `@v0.11`, `@beta`,
-etc).
+### Updating `comrak`
 
-### Files
+`webi comrak@stable`
 
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/comrak
-~/.config/comrak/config
-```
+Use the `@beta` tag for pre-releases.
 
 ## Cheat Sheet
 
@@ -25,7 +17,7 @@ install:
 > Flavored Markdown Spec: Tables, Task list items, Strikethrough, Autolinks, &
 > Disallowed Raw HTML
 
-```sh
+```bash
 comrak --gfm index.md > index.html
 ```
 
@@ -39,7 +31,7 @@ Here you'll learn how to:
 
 ## How to Convert Markdown to HTML
 
-```sh
+```bash
 comrak --gfm --header-ids '' README.md > README.html
 ```
 
@@ -50,7 +42,7 @@ defaults to always include your favorite options.
 
 Here's what I suggest:
 
-```sh
+```bash
 echo "--gfm --header-ids ''" > ~/.config/comrak/config
 ```
 
@@ -73,7 +65,7 @@ Example:
 Then, to sanitize `<script>` and `<iframe>` tags you must add `-e tagfilter`
 (which the `--gfm` option also enables).
 
-```sh
+```bash
 comrak --unsafe --gfm --header-ids '' README.md
 ```
 
@@ -86,7 +78,7 @@ The `--unsafe` option
 If you want Github-Flavored Markdown with trusted scripts, you'll need to enable
 its extensions by hand:
 
-```sh
+```bash
 echo "
 # WARNING: allows <script>, <iframe>
 # and <a href=javascript:alert('')>
@@ -111,7 +103,7 @@ echo "
 " > ~/.config/comrak/allow-scripts
 ```
 
-```sh
+```bash
 comrak --config ~/.config/comrak/allow-scripts README.md
 ```
 
@@ -121,6 +113,6 @@ You can disable all options with `--config-file none`.
 
 Example:
 
-```sh
+```bash
 comrak --config-file none -e table README.md
 ```

comrak/install.ps1

@@ -3,35 +3,38 @@
 $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe"
 $EXENAME = "$Env:PKG_NAME.exe"
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part"
-    & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part"
+    & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME")) {
-    Write-Output "Installing $Env:PKG_NAME"
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME"))
+{
+    echo "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
+        # Remove any leftover tmp cruft
+        Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
 
-    # Move single binary into root of temporary folder
-    & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE" "$VERNAME"
+        # Move single binary into root of temporary folder
+        & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE" "$VERNAME"
 
-    # Settle unpacked archive into place
-    Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME"
-    New-Item "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin" -ItemType Directory -Force | Out-Null
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin"
+        # Settle unpacked archive into place
+        echo "New Name: $VERNAME"
+        echo "New Location: $Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME"
+        New-Item "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin" -ItemType Directory -Force | out-null
+        Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME'"
+echo "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
 Copy-Item -Path "$Env:USERPROFILE\.local\opt\$Env:PKG_NAME-v$Env:WEBI_VERSION\bin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

comrak/install.sh

@@ -1,8 +1,8 @@
-#!/bin/sh
-set -e
-set -u
+#!/bin/bash
 
-__init_comrak() {
+{
+    set -e
+    set -u
 
     ##################
     # Install comrak #
@@ -15,7 +15,7 @@ __init_comrak() {
         #       comrak 0.8.1
         # This trims it down to just the version number:
         #       0.8.1
-        comrak --version 2> /dev/null | head -n 1 | cut -d' ' -f 2
+        echo $(comrak --version 2> /dev/null | head -n 1 | cut -d' ' -f 2)
     }
 
     pkg_install() {
@@ -34,5 +34,3 @@ __init_comrak() {
         "$pkg_src_cmd" --version > /dev/null
     }
 }
-
-__init_comrak

curlie/README.md

@@ -5,19 +5,14 @@ tagline: |
   curlie wraps `curl` with modern defaults and `httpie`-like syntax highlighting
 ---
 
-To update or switch versions, run `webi curlie@stable` (or `@v1.6`, `@beta`,
-etc).
+## Updating
 
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/curlie
+```bash
+webi curlie@stable
 ```
 
+Use the `@beta` tag for pre-releases.
+
 ## Cheat Sheet
 
 > If you like the interface of HTTPie but miss the features of curl, curlie is
@@ -30,32 +25,21 @@ install:
 
 **JSON** (`=`) is the default encoding for `key=value` pairs.
 
-### How to alias as `curl`
-
-Use [aliasman](/aliasman):
-
-```sh
-aliasman curl 'curlie'
-alias curl='curlie'
-```
-
-This will affect the interactive shell, but not scripts.
-
 ### Simple GET
 
-```sh
+```bash
 curlie -v example.com
 ```
 
 ### POST simple JSON with headers
 
-```sh
+```bash
 curlie -v POST httpbin.org/status/201 "Authorization: Bearer xxxx" "name=John Doe"
 ```
 
 ### POST large JSON
 
-```sh
+```bash
 curlie -v POST httpbin.org/status/201 "Authorization: Bearer xxxx" -d '
 [
     {
@@ -70,7 +54,7 @@ curlie -v POST httpbin.org/status/201 "Authorization: Bearer xxxx" -d '
 The `--resolve` option is for when you need to test a local service as if it had
 a remote hostname and TLS SNI (or when you want to break things 😈).
 
-```sh
+```bash
 curlie https://foo.example.com:8443 "Host: foo.example.com" \
     --resolve foo.example.com:8443:127.0.0.1
 ```

curlie/install.ps1

@@ -3,39 +3,42 @@
 $VERNAME = "$Env:PKG_NAME-v$Env:WEBI_VERSION.exe"
 $EXENAME = "$Env:PKG_NAME.exe"
 # Fetch archive
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part"
-    & Move-Item "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
+IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"))
+{
+    # TODO: arch detection
+    echo "Downloading $Env:PKG_NAME from $Env:WEBI_PKG_URL to $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part"
+    & move "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE.part" "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
 }
 
-IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME")) {
-    Write-Output "Installing $Env:PKG_NAME"
+IF (!(Test-Path -Path "$Env:USERPROFILE\.local\xbin\$VERNAME"))
+{
+    echo "Installing $Env:PKG_NAME"
     # TODO: temp directory
 
     # Enter tmp
-    Push-Location .local\tmp
+    pushd .local\tmp
 
-    # Remove any leftover tmp cruft
-    Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
+        # Remove any leftover tmp cruft
+        Remove-Item -Path "$Env:PKG_NAME-v*" -Recurse -ErrorAction Ignore
 
-    # Unpack archive
-    # Windows BSD-tar handles zip. Imagine that.
-    Write-Output "Unpacking $Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    & tar xf "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-    # Move single binary into root of temporary folder
-    & Move-Item "$EXENAME" "$VERNAME"
+        # Unpack archive
+        # Windows BSD-tar handles zip. Imagine that.
+        echo "Unpacking $Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+        & tar xf "$Env:USERPROFILE\Downloads\$Env:WEBI_PKG_FILE"
+        # Move single binary into root of temporary folder
+        & move "$EXENAME" "$VERNAME"
 
 
-    # Settle unpacked archive into place
-    Write-Output "New Name: $VERNAME"
-    Write-Output "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
-    Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
+        # Settle unpacked archive into place
+        echo "New Name: $VERNAME"
+        echo "New Location: $Env:USERPROFILE\.local\xbin\$VERNAME"
+        Move-Item -Path "$VERNAME" -Destination "$Env:USERPROFILE\.local\xbin"
 
     # Exit tmp
-    Pop-Location
+    popd
 }
 
-Write-Output "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
+echo "Copying into '$Env:USERPROFILE\.local\bin\$EXENAME' from '$Env:USERPROFILE\.local\xbin\$VERNAME'"
 Remove-Item -Path "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse -ErrorAction Ignore
 Copy-Item -Path "$Env:USERPROFILE\.local\xbin\$VERNAME" -Destination "$Env:USERPROFILE\.local\bin\$EXENAME" -Recurse

curlie/install.sh

@@ -1,8 +1,8 @@
-#!/bin/sh
-set -e
-set -u
+#!/bin/bash
 
-__init_curlie() {
+{
+    set -e
+    set -u
 
     ##################
     # Install curlie #
@@ -12,10 +12,12 @@ __init_curlie() {
 
     pkg_get_current_version() {
         # 'curlie --version' has output in this format:
-        #       curlie 1.6.9 (2022-04-04T15:04:20Z)
+        #       TODO
         # This trims it down to just the version number:
-        #       1.6.9
-        curlie version 2> /dev/null | head -n 1 | cut -d' ' -f 2
+        #       TODO
+        #echo $(curlie --version 2>/dev/null | head -n 1 | cut -d' ' -f 2)
+        # See https://github.com/rs/curlie/issues/22
+        echo "0.0.0"
     }
 
     pkg_install() {
@@ -29,5 +31,3 @@ __init_curlie() {
         chmod a+x "$pkg_src_cmd"
     }
 }
-
-__init_curlie

dashcore-utils/README.md

@@ -1,140 +0,0 @@
----
-title: Dash Core Desktop Wallet
-homepage: https://webinstall.dev/dashcore-utils/
-tagline: |
-  Utilities for Dash Core (DASH / Digital Cash)
----
-
-To update, run `webi dashcore-utils`.
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```txt
-~/.config/envman/PATH.env
-~/.local/opt/dashcore/
-
-~/.local/bin/dash-qt-hd
-~/.local/bin/dashd-hd
-~/.local/bin/dashd-hd-service-install
-```
-
-[`dashcore`](../dashcore/) will also be installed if not present.
-
-## Cheat Sheet
-
-> Convenience scripts for running the Dash Daemon or the Dash Core Desktop
-> Wallet.
-
-- `dash-qt-hd`
-- `dash-qt-testnet`
-- `dashd-hd`
-- `dashd-hd-service-install`
-- `dashd-testnet`
-- `dashd-testnet-service-install`
-
-For historical reasons [`dashd`](../dashd/) (System Daemon) and
-[`dash-qt`](../dashcore/) (Desktop Wallet) use _lossy_ keys (non-HD wallets) by
-default, and the storage options options are not intuitive.
-
-These scripts run them with safer options that are easier to configure for
-server and desktop deployment, respectively.
-
-### How to run the DASH System Daemon
-
-1. Mount or otherwise designate a user-owned folder on a storage volume with
-   60g+ free space, such as
-   ```sh
-   /mnt/slc1_vol_100g/dashcore/
-   ```
-2. Generally you'll want to install the Dash Daemon as a system service
-   ```sh
-   dashd-hd-install-service /mnt/vol_slc1_100g/dashcore/
-   ```
-
-To accomplish the same manually you would:
-
-1. Create `~/.dashcore/dash.conf` with
-   [reasonable defaults](../packages/dashcore-utils/dash.example.conf)
-
-   ```ini
-   txindex=1
-   addressindex=1
-   timestampindex=1
-   spentindex=1
-
-   [main]
-   rpcuser=RPCUSER_MAIN
-   rpcpassword=RPCPASS_MAIN
-   # to run on multiple interfaces, use multiple config lines
-   # ex: bind=127.0.0.1:9999 and bind=10.0.0.100:9999)
-   bind=127.0.0.1:9999
-   rpcbind=127.0.0.1:9998
-   rpcconnect=127.0.0.1:9998
-   rpcallowip=127.0.0.1/16
-   # zmq* can only be bound to a single interface
-   # See https://github.com/dashpay/dash/issues/5461
-   zmqpubrawtx=tcp://127.0.0.1:28332
-   zmqpubrawtxlock=tcp://127.0.0.1:28332
-   zmqpubrawchainlock=tcp://127.0.0.1:28332
-   zmqpubhashchainlock=tcp://127.0.0.1:28332
-
-   [test]
-   # ...
-
-   [regtest]
-   # ...
-   ```
-
-Which is essentially the same as:
-
-```sh
-my_user="$(id -u -n)"
-
-sudo mkdir /mnt/slc1_vol_100g/dashcore/
-chown -R "$my_user" /mnt/slc1_vol_100g/dashcore/
-
-mkdir -p ~/.dashcore/wallets/
-mkdir -p /mnt/slc1_vol_100g/dashcore/_data
-mkdir -p /mnt/slc1_vol_100g/dashcore/_caches
-
-sudo env PATH="$PATH" serviceman add \
-        --system --user "$my_user" --path "$PATH" --name dashd --force -- \
-    dashd \
-        -usehd \
-        -conf="$HOME/.dashcore/dash.conf" \
-        -walletdir="$HOME/.dashcore/wallets/" \
-        -datadir=/mnt/slc1_vol_100g/dashcore/_data \
-        -blocksdir=/mnt/slc1_vol_100g/dashcore/_caches
-```
-
-See also:
-
-- [The `dashd` Cheat Sheet](../dashd/).
-
-### How to run the DASH Desktop Wallet
-
-To open an existing (or create a new) Dash Desktop Wallet:
-
-```sh
-dash-qt-hd
-```
-
-Which is essentially the same as:
-
-```sh
-dash-qt \
-    -usehd \
-    -walletdir="$HOME/.config/dashcore/wallets/" \
-    -settings="$HOME/.config/dashcore/settings.json" \
-    -datadir="$HOME/.dashcore/_data/" \
-    -blocksdir="$HOME/.dashcore/_caches/"
-```
-
-Or pass `-testnet` to use with _TestNet_.
-
-See also:
-
-- [The `dash-qt` Cheat Sheet](../dashcore/).

dashcore-utils/dash-qt-hd

@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# I don't have the gall to change the defaults (Webi values),
-# but I would *strongly* recommend that you do!
-#
-# Instance-specific data should be separate from global caches:
-#
-# -settings="$HOME/.config/dashcore/settings.json" \
-# -walletdir="$HOME/.config/dashcore/wallets/" \
-# -datadir="$HOME/.dashcore/_data/" \
-# -blocksdir="$HOME/.dashcore/_caches/" \
-
-dash-qt \
-    -usehd \
-    -enablecoinjoin=1 \
-    -coinjoinautostart=1 \
-    -coinjoinrounds=16 \
-    -coinjoindenomsgoal=10 \
-    -coinjoindenomshardcap=25

dashcore-utils/dash-qt-testnet

@@ -1,22 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# I don't have the gall to change the defaults (Webi values),
-# but I would *strongly* recommend that you do!
-#
-# Instance-specific data should be separate from global caches:
-#
-# -settings="$HOME/.config/dashcore/settings.json" \
-# -walletdir="$HOME/.config/dashcore/wallets/" \
-# -datadir="$HOME/.dashcore/_data/" \
-# -blocksdir="$HOME/.dashcore/_caches/" \
-
-dash-qt \
-    -testnet \
-    -usehd \
-    -enablecoinjoin=1 \
-    -coinjoinautostart=1 \
-    -coinjoinrounds=16 \
-    -coinjoindenomsgoal=10 \
-    -coinjoindenomshardcap=25

dashcore-utils/dash.example.conf

@@ -1,44 +0,0 @@
-txindex=1
-addressindex=1
-timestampindex=1
-spentindex=1
-
-[main]
-rpcuser=RPCUSER_MAIN
-rpcpassword=RPCPASS_MAIN
-# to run on multiple interfaces, use multiple config lines
-# ex: bind=127.0.0.1:9999 and bind=10.0.0.100:9999)
-bind=127.0.0.1:9999
-rpcbind=127.0.0.1:9998
-rpcconnect=127.0.0.1:9998
-rpcallowip=127.0.0.1/16
-# zmq* can only be bound to a single interface
-# See https://github.com/dashpay/dash/issues/5461
-zmqpubrawtx=tcp://127.0.0.1:28332
-zmqpubrawtxlock=tcp://127.0.0.1:28332
-zmqpubrawchainlock=tcp://127.0.0.1:28332
-zmqpubhashchainlock=tcp://127.0.0.1:28332
-
-[test]
-rpcuser=RPCUSER_TEST
-rpcpassword=RPCPASS_TEST
-bind=127.0.0.1:19999
-rpcbind=127.0.0.1:19998
-rpcconnect=127.0.0.1:19998
-rpcallowip=127.0.0.1/16
-zmqpubrawtx=tcp://127.0.0.1:18009
-zmqpubrawtxlock=tcp://127.0.0.1:18009
-zmqpubrawchainlock=tcp://127.0.0.1:18009
-zmqpubhashchainlock=tcp://127.0.0.1:18009
-
-[regtest]
-rpcuser=RPCUSER_REGTEST
-rpcpassword=RPCPASS_REGTEST
-bind=127.0.0.1:19899
-rpcbind=127.0.0.1:19898
-rpcconnect=127.0.0.1:19898
-rpcallowip=127.0.0.1/16
-zmqpubrawtx=tcp://127.0.0.1:18809
-zmqpubrawtxlock=tcp://127.0.0.1:18809
-zmqpubrawchainlock=tcp://127.0.0.1:18809
-zmqpubhashchainlock=tcp://127.0.0.1:18809

dashcore-utils/dashd-hd

@@ -1,46 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# Unfortunately we can't know that datadir won't be used
-# for other non-cache files, but we can at least protect
-# the ones we're aware of.
-
-my_netname="${1:-}"
-if test -n "${my_netname}"; then
-    if test "${my_netname}" != mainnet &&
-        test "${my_netname}" != testnet &&
-        test "${my_netname}" != regnet &&
-        test "${my_netname}" != devnet; then
-
-        echo ""
-        echo "ERROR"
-        echo "        '${my_netname}' is not one of 'testnet', 'regnet', 'devnet'"
-        echo ""
-        echo ""
-    fi
-    if test "${my_netname}" != mainnet; then
-        my_netname=''
-    fi
-fi
-
-my_net_arg=''
-if test -n "${my_netname}"; then
-    my_net_arg="-${my_netname}"
-fi
-
-# shellcheck disable=2086
-dashd \
-    -usehd \
-    ${my_net_arg} \
-    -conf="$HOME/.dashcore/dash.conf" \
-    -settings="$HOME/.dashcore/settings.json" \
-    -walletdir="$HOME/.dashcore/wallets/" \
-    -datadir="$HOME/.dashcore/_data/" \
-    -blocksdir="$HOME/.dashcore/_data/"
-
-#   -enablecoinjoin=1 \
-#   -coinjoinautostart=1 \
-#   -coinjoinrounds=16 \
-#   -coinjoindenomsgoal=10 \
-#   -coinjoindenomshardcap=25

dashcore-utils/dashd-hd-service-install

@@ -1,176 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-fn_usage() { (
-    echo >&2 ""
-    echo >&2 "USAGE"
-    echo >&2 "        dashd-hd-service-install [datadir] ['testnet']"
-    echo >&2 ""
-    echo >&2 "EXAMPLE"
-    echo >&2 "        dashd-hd-service-install /mnt/vol_slc1_100g/dashcore/"
-    echo >&2 ""
-    echo >&2 "NOTE"
-    echo >&2 "        If a directory matching '/mnt/*/dashcore/' is found,"
-    echo >&2 "        it will be used automatically."
-    echo >&2 ""
-); }
-
-fn_datadir_help() { (
-    my_vol="${1:-}"
-    my_user="$(
-        id -n -u
-    )"
-    my_group="$(
-        id -n -g
-    )"
-
-    echo >&2 ""
-    echo >&2 "ERROR"
-    echo >&2 "        '${my_vol}' is not writable"
-    echo >&2 ""
-    echo >&2 "SOLUTION"
-    echo >&2 "        1. Mount a large (50gb+) volume"
-    echo >&2 ""
-    echo >&2 "              sudo mkdir -p /mnt/EXAMPLE"
-    echo >&2 "              sudo mount /dev/sdx1 /mnt/EXAMPLE"
-    echo >&2 ""
-    echo >&2 "        2. Create a 'dashcore' inside of it"
-    echo >&2 ""
-    echo >&2 "              sudo mkdir -p '${my_vol}'"
-    echo >&2 ""
-    echo >&2 "        3. Make it writable to this user"
-    echo >&2 ""
-    echo >&2 "              sudo chown -R '${my_user}':'${my_group}' '${my_vol}'"
-    echo >&2 ""
-    echo >&2 ""
-); }
-
-fn_srv_install() { (
-    my_vol="${1:-}"
-    my_netname="${2:-}"
-
-    my_name='dashd'
-
-    # both of these will get '/testnet3' suffixes with -testnet
-    my_datadir="${my_vol}/_data"
-    my_blocksdir="${my_vol}/_caches"
-
-    if test -n "${my_netname}"; then
-        if test "mainnet" = "${my_netname}"; then
-            my_netname=""
-        elif test "testnet" != "${my_netname}"; then
-            fn_usage
-            return 1
-        fi
-    fi
-
-    if ! test -d "${my_datadir}"; then
-        mkdir "${my_datadir}"
-        chmod 0700 "${my_datadir}"
-    fi
-    if ! test -d "${my_blocksdir}"; then
-        mkdir -p "${my_blocksdir}"
-        chmod 0700 "${my_blocksdir}"
-    fi
-
-    my_net_flag=''
-    if test -n "${my_netname}"; then
-        # ex: -testnet
-        my_net_flag="-${my_netname}"
-
-        # ex: dashd-testnet
-        my_name="dashd-${my_netname}"
-    fi
-
-    my_system_args=""
-    my_kernel="$(
-        uname -s
-    )"
-    if test "Darwin" != "${my_kernel}"; then
-        my_user="$(
-            id -u -n
-        )"
-        my_system_args="--system --username ${my_user}"
-    fi
-
-    # shellcheck disable=SC2016,SC1090
-    echo 'sudo env PATH="$PATH"' \
-        "serviceman add ${my_system_args} --path \"\$PATH\" --name \"${my_name}\" --force --" \
-        "dashd " \
-        "${my_net_flag}" \
-        -usehd \
-        '-conf="$HOME/.dashcore/dash.conf"' \
-        '-settings="$HOME/.dashcore/settings.json"' \
-        '-walletdir="$HOME/.dashcore/wallets/"' \
-        "-datadir=\"${my_datadir}\"" \
-        "-blocksdir=\"${my_blocksdir}\""
-
-    if ! command -v serviceman > /dev/null; then
-        echo ""
-        echo "Installing 'serviceman'..."
-        echo ""
-        {
-            curl -fsSL "${WEBI_HOST}/serviceman" | sh
-        } > /dev/null
-
-        # shellcheck disable=SC1090
-        . ~/.config/envman/PATH.env || true
-    fi
-
-    mkdir -p "$HOME/.dashcore/wallets/"
-    chmod 0700 "$HOME/.dashcore/wallets/"
-
-    mkdir -p "${my_datadir}"
-    chmod 0700 "${my_datadir}"
-
-    mkdir -p "${my_blocksdir}"
-    chmod 0700 "${my_blocksdir}"
-
-    cd "${my_vol}" || return 1
-    # leave options unquoted so they're interpreted separately
-    # shellcheck disable=SC2086
-    sudo env PATH="${PATH}" \
-        serviceman add ${my_system_args} --path "${PATH}" --name "${my_name}" --force -- \
-        dashd \
-        ${my_net_flag} \
-        -usehd \
-        -conf="${HOME}/.dashcore/dash.conf" \
-        -settings="${HOME}/.dashcore/settings.json" \
-        -walletdir="${HOME}/.dashcore/wallets/" \
-        -datadir="${my_datadir}" \
-        -blocksdir="${my_blocksdir}"
-
-); }
-
-main() { (
-    my_vol="${1:-}"
-    my_netname="${2:-}"
-
-    if test -z "${my_vol}"; then
-        my_vol="$(
-            ls -d /mnt/*/dashcore/ 2> /dev/null || true
-        )"
-    fi
-
-    if test "help" = "${my_vol}" ||
-        test "--help" = "${my_vol}"; then
-        fn_usage
-        return 0
-    fi
-
-    if test -z "${my_vol}"; then
-        fn_usage
-        return 1
-    fi
-
-    if ! test -d "${my_vol}" ||
-        ! test -w "${my_vol}"; then
-        fn_datadir_help "${my_vol}"
-        return 1
-    fi
-
-    fn_srv_install "${my_vol}" "${my_netname}"
-); }
-
-main "${@:-}"

dashcore-utils/dashd-testnet

@@ -1,13 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-# NOTE:
-#       The '-testnet' flag will always cause a './testnet3/' folder
-#       to be created under '-datadir' (it won't the 'datadir' directly)
-#
-# Example:
-#       dashd -testnet -datadir="$HOME/.dashcore/"
-#       will save to ~/.dashcore/testnet3/, NOT ~/.dashcore/
-
-dashd-hd testnet