WIP: ref(installer): use new names for template vars

fix(webi): remove bogus ./webi/releases.js
chore(ci): add git submodule
2026-06-05 07:22:46 +00:00 · 2023-12-30 23:40:14 -07:00 · 2023-12-30 23:38:41 -07:00 · 2023-12-30 23:38:40 -07:00 · 2023-12-30 23:38:40 -07:00 · 2023-12-30 23:38:36 -07:00
47 changed files with 333 additions and 1331 deletions
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -32,6 +32,4 @@ jobs:
      - run: npm run fmt
      - run: npm ci
      - run: npm run lint
-      - env:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: npm run test
+      - run: npm run test
--- a/README.md
+++ b/README.md
@@ -98,10 +98,9 @@ You just fill in the blanks.
 Just create an empty directory and run the tests until you get a good result.

 ```sh
-git clone git@github.com:webinstall/webi-installers.git
-pushd ./webi-installers/
-git submodule update --init
-npm clean-install
+git clone git@github.com:webinstall/packages.git
+pushd packages
+npm install
 ```

 ```sh
--- a/_common/gitea.js
+++ b/_common/gitea.js
@@ -1,46 +1,35 @@
 'use strict';

-var GitHubish = require('./githubish.js');
+var ghRelease = require('./github.js');

 /**
- * Lists Gitea Releases (w/ uploaded assets)
+ * Gets the releases for 'ripgrep'. This function could be trimmed down and made
+ * for use with any github release.
 *
- * @param {any} _request - deprecated
- * @param {String} owner
- * @param {String} repo
- * @param {String} baseurl
- * @param {String} [username]
- * @param {String} [token]
+ * @param request
+ * @param {string} owner
+ * @param {string} repo
+ * @returns {PromiseLike<any> | Promise<any>}
 */
-async function getAllReleases(
-  _request,
-  owner,
-  repo,
-  baseurl,
-  username = '',
-  token = '',
-) {
-  baseurl = `${baseurl}/api/v1`;
-  let all = await GitHubish.getAllReleases({
-    owner,
-    repo,
-    baseurl,
-    username,
-    token,
-  });
-  return all;
+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;
+    },
+  );
 }

 module.exports = getAllReleases;

 if (module === require.main) {
  getAllReleases(
-    null,
-    'root',
-    'pathman',
-    'https://git.rootprojects.org',
-    '',
-    '',
+    require('@root/request'),
+    'coolaj86',
+    'go-pathman',
+    'https://git.coolaj86.com',
  ).then(
    //getAllReleases(require('@root/request'), 'root', 'serviceman', 'https://git.rootprojects.org').then(
    function (all) {
--- a/_common/github.js
+++ b/_common/github.js
@@ -1,41 +1,102 @@
 'use strict';

-require('dotenv').config({ path: '.env' });
-
-let GitHubish = require('./githubish.js');
+require('dotenv').config();

 /**
 * Lists GitHub Releases (w/ uploaded assets)
 *
- * @param {any} _request - deprecated
- * @param {String} owner
- * @param {String} repo
- * @param {String} [baseurl]
- * @param {String} [username]
- * @param {String} [token]
+ * @param request
+ * @param {string} owner
+ * @param {string} repo
+ * @returns {PromiseLike<any> | Promise<any>}
 */
 async function getAllReleases(
-  _request,
+  request,
  owner,
  repo,
  baseurl = 'https://api.github.com',
-  username = process.env.GITHUB_USERNAME || '',
-  token = process.env.GITHUB_TOKEN || '',
 ) {
-  let all = await GitHubish.getAllReleases({
-    owner,
-    repo,
-    baseurl,
-    username,
-    token,
-  });
+  if (!owner) {
+    throw new Error('missing owner for repo');
+  }
+  if (!repo) {
+    throw new Error('missing repo name');
+  }
+
+  var 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);
+  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');
+  }
+
+  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) {
+    for (let asset of release['assets']) {
+      let name = asset['name'];
+      let date = release['published_at']?.replace(/T.*/, '');
+      let download = asset['browser_download_url'];
+
+      // TODO tags aren't always semver / sensical
+      let version = release['tag_name'];
+      let channel;
+      if (release['prerelease']) {
+        // -rcX, -preview, -beta, etc will be checked in _webi/normalize.js
+        channel = 'beta';
+      }
+      let lts = /(\b|_)(lts)(\b|_)/.test(release['tag_name']);
+
+      all.releases.push({
+        name: name,
+        version: version,
+        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: download,
+      });
+    }
+  }
+
  return all;
 }

 module.exports = getAllReleases;

 if (module === require.main) {
-  getAllReleases(null, 'BurntSushi', 'ripgrep').then(function (all) {
-    console.info(JSON.stringify(all, null, 2));
-  });
+  getAllReleases(require('@root/request'), 'BurntSushi', 'ripgrep').then(
+    function (all) {
+      console.info(JSON.stringify(all, null, 2));
+    },
+  );
 }
--- a/_common/githubish.js
+++ b/_common/githubish.js
@@ -1,124 +0,0 @@
-'use strict';
-
-let GitHubish = module.exports;
-
-/**
- * Lists GitHub-Like Releases (w/ uploaded assets)
- *
- * @param {Object} opts
- * @param {String} opts.owner
- * @param {String} opts.repo
- * @param {String} opts.baseurl
- * @param {String} [opts.username]
- * @param {String} [opts.token]
- */
-GitHubish.getAllReleases = async function ({
-  owner,
-  repo,
-  baseurl,
-  username = '',
-  token = '',
-}) {
-  if (!owner) {
-    throw new Error('missing owner for repo');
-  }
-  if (!repo) {
-    throw new Error('missing repo name');
-  }
-  if (!baseurl) {
-    throw new Error('missing baseurl');
-  }
-
-  let url = `${baseurl}/repos/${owner}/${repo}/releases`;
-  let opts = {
-    headers: {
-      'Content-Type': 'appplication/json',
-    },
-  };
-
-  if (token) {
-    let userpass = `${username}:${token}`;
-    let basicAuth = btoa(userpass);
-    Object.assign(opts.headers, {
-      Authentication: `Basic ${basicAuth}`,
-    });
-  }
-
-  let resp = await fetch(url, opts);
-  if (!resp.ok) {
-    let headers = Array.from(resp.headers);
-    console.error('Bad Resp Headers:', headers);
-    let text = await resp.text();
-    console.error('Bad Resp Body:', text);
-    let msg = `failed to fetch releases from '${baseurl}' with user '${username}'`;
-    throw new Error(msg);
-  }
-
-  let respText = await resp.text();
-  let gHubResp;
-  try {
-    gHubResp = JSON.parse(respText);
-  } catch (e) {
-    console.error('Bad Resp JSON:', respText);
-    console.error(e.message);
-    let msg = `failed to parse releases from '${baseurl}' with user '${username}'`;
-    throw new Error(msg);
-  }
-
-  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);
-    let msg = `failed to transform releases from '${baseurl}' with user '${username}'`;
-    throw new Error(msg);
-  }
-
-  function transformReleases(release) {
-    for (let asset of release['assets']) {
-      let name = asset['name'];
-      let date = release['published_at']?.replace(/T.*/, '');
-      let download = asset['browser_download_url'];
-
-      // TODO tags aren't always semver / sensical
-      let version = release['tag_name'];
-      let channel;
-      if (release['prerelease']) {
-        // -rcX, -preview, -beta, etc will be checked in _webi/normalize.js
-        channel = 'beta';
-      }
-      let lts = /(\b|_)(lts)(\b|_)/.test(release['tag_name']);
-
-      all.releases.push({
-        name: name,
-        version: version,
-        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: download,
-      });
-    }
-  }
-
-  return all;
-};
-
-if (module === require.main) {
-  GitHubish.getAllReleases({
-    owner: 'BurntSushi',
-    repo: 'ripgrep',
-    baseurl: 'https://api.github.com',
-  }).then(function (all) {
-    console.info(JSON.stringify(all, null, 2));
-  });
-}
--- a/_webi/build-classifier
+++ b/_webi/build-classifier
--- a/_webi/builds-cacher-test.js
+++ b/_webi/builds-cacher-test.js
@@ -1,73 +0,0 @@
-'use strict';
-
-let Path = require('node:path');
-
-let BuildsCacher = require('./builds-cacher.js');
-// let Parallel = require('./parallel.js');
-
-var INSTALLERS_DIR = Path.join(__dirname, '..');
-var CACHE_DIR = Path.join(__dirname, '../_cache');
-
-async function main() {
-  let bc = BuildsCacher.create({
-    caches: CACHE_DIR,
-    installers: INSTALLERS_DIR,
-  });
-  bc.freshenRandomPackage(600 * 1000);
-
-  // let dirs = await bc.getProjectsByType();
-  // let projNames = Object.keys(dirs.valid);
-
-  let lastUpdate;
-
-  let projName = 'k9s';
-  {
-    let packages = await bc.getPackages({
-      //Releases: Releases,
-      name: projName,
-      date: new Date(),
-    });
-    lastUpdate = packages.updated;
-    console.info(
-      `Last update for '${projName}': ${packages.updated} (${packages.releases.length} assets)`,
-    );
-  }
-
-  console.info('Waiting 5s');
-  {
-    setTimeout(async function () {
-      let packages = await bc.getPackages({
-        //Releases: Releases,
-        name: projName,
-        date: new Date(),
-      });
-      console.info(
-        `Last update for '${projName}': ${packages.updated} (${packages.releases.length} assets)`,
-      );
-      if (lastUpdate < packages.updated) {
-        console.info(`PASS`);
-      } else {
-        console.info(`MAYBE fail`);
-      }
-    }, 5 * 1000);
-  }
-
-  //let parallel = 25;
-  //await Parallel.run(parallel, projNames, getAll);
-  //async function getAll(name) {
-  //  void (await bc.getPackages({
-  //    //Releases: Releases,
-  //    name: name,
-  //    date: new Date(),
-  //  }));
-  //}
-}
-
-main()
-  .then(function () {
-    console.log('Done');
-  })
-  .catch(function (e) {
-    console.error(e.stack || e);
-    process.exit(1);
-  });
--- a/_webi/builds-cacher.js
+++ b/_webi/builds-cacher.js
@@ -54,54 +54,6 @@ var TERMS_META = [
  'stable',
 ];

-/** @typedef {String} TripletString - {arch}-{vendor}-{os}-{libc} */
-/** @typedef {String} VersionString */
-/** @typedef {Object.<VersionString, Array<BuildAsset>>} PackagesByRelease */
-
-/**
- * @typedef ProjectInfo
- * @prop {Array<BuildAsset>} releases
- * @prop {Array<BuildAsset>} packages
- * @prop {Object.<TripletString, PackagesByRelease>} releasesByTriplet
- * @prop {Array<import('./build-classifier/types.js').ArchString>} arches
- * @prop {Array<import('./build-classifier/types.js').OsString>} oses
- * @prop {Array<import('./build-classifier/types.js').LibcString>} libcs
- * @prop {Array<String>} channels
- * @prop {Array<String>} formats
- * @prop {Array<String>} triplets
- * @prop {Array<String>} versions
- * @prop {Array<String>} lexvers
- * @prop {Object.<String, String>} lexversMap
- */
-
-/**
- * @typedef BuildAsset
- * @prop {String} name
- * @prop {String} version
- * @prop {Boolean} lts
- * @prop {String} date
- * @prop {String} arch
- * @prop {String} os
- * @prop {String} libc
- * @prop {String} ext
- * @prop {String} download
- */
-
-/**
- * @typedef VersionTarget
- * @prop {String} version
- * @prop {Boolean} lts
- * @prop {String} channel
- */
-
-/** @typedef {TargetTriplet & HostTargetPartial} HostTarget */
-/** @typedef {import('./build-classifier/types.js').TargetTriplet} TargetTriplet */
-/**
- * @typedef HostTargetPartial
- * @prop {String} target.triplet - os-vendor-arch-libc
- * @prop {Error} target.error
- */
-
 async function getPartialHeader(path) {
  let readme = `${path}/README.md`;
  let head = await readFirstBytes(readme).catch(function (err) {
@@ -120,7 +72,7 @@ async function readFirstBytes(path) {
  let start = 0;
  let n = 1024;
  let fh = await Fs.open(path, 'r');
-  let buf = Buffer.alloc(n);
+  let buf = new Buffer.alloc(n);
  let result = await fh.read(buf, start, n);
  let str = result.buffer.toString('utf8');
  await fh.close();
@@ -130,8 +82,6 @@ async function readFirstBytes(path) {

 let promises = {};
 async function getLatestBuilds(Releases, installersDir, cacheDir, name, date) {
-  console.info(`[INFO] getLatestBuilds: ${name}`);
-
  if (!Releases) {
    Releases = require(`${installersDir}/${name}/releases.js`);
  }
@@ -325,21 +275,17 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    let isoDate = date.toISOString();
    let yearMonth = isoDate.slice(0, 7);
    let dataFile = `${cacheDir}/${yearMonth}/${name}.json`;
-    let tsFile = `${cacheDir}/${yearMonth}/${name}.updated.txt`;

-    let tsDate;
-    {
-      let secondsStr = await Fs.readFile(tsFile, 'ascii').catch(function (err) {
-        if (err.code !== 'ENOENT') {
-          throw err;
-        }
-        return '0';
-      });
-      secondsStr = secondsStr.trim();
-      let seconds = parseFloat(secondsStr) || 0;
-      let ms = seconds * 1000;
-      tsDate = new Date(ms);
-    }
+    // let secondsStr = await Fs.readFile(tsFile, 'ascii').catch(function (err) {
+    //   if (err.code !== 'ENOENT') {
+    //     throw err;
+    //   }
+    //   return '0';
+    // });
+    // secondsStr = secondsStr.trim();
+    // let seconds = parseFloat(secondsStr) || 0;
+
+    // let age = now - seconds;

    let projInfo = bc._caches[name];

@@ -381,14 +327,11 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    if (!projInfo) {
      projInfo = await getLatestBuilds(Releases, installersDir, cacheDir, name);
    }
-    transformAndUpdate(name, projInfo, meta, tsDate);

    process.nextTick(async function () {
      let now = date.valueOf();
      let age = now - projInfo.updated;
-
-      let fresh = age < bc._staleAge;
-      if (fresh) {
+      if (age < bc._staleAge) {
        return;
      }

@@ -396,6 +339,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
      transformAndUpdate(name, projInfo, meta, date);
    });

+    transformAndUpdate(name, projInfo, meta, date);
    return projInfo;
  };

@@ -403,7 +347,6 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    meta.packages = [];

    let updated = date.valueOf();
-
    Object.assign(projInfo, { name, updated }, meta);
    for (let build of projInfo.releases) {
      let buildTarget = bc.classify(projInfo, build);
@@ -424,10 +367,6 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
        continue;
      }

-      if (!build.name) {
-        build.name = build.download.replace(/.*\//, '');
-      }
-
      build.target = buildTarget;
      meta.packages.push(build);
    }
@@ -512,7 +451,6 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
      name: name,
      date: new Date(),
    }));
-    console.info(`[INFO] freshenRandomPackage: ${name}`);

    let hour = 60 * 60 * 1000;
    let delay = minDelay;
@@ -746,7 +684,6 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    exts.push('.git');

    // Fallbacks
-    // (we include everything to bubble an extract error over not found)
    exts.push('.app.zip');
    exts.push('.dmg');
    exts.push('.pkg');
@@ -797,35 +734,21 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
  };

  /**
-   * @param {ProjectInfo} projInfo
-   * @param {HostTarget} hostTarget
+   * @param {Object} target
+   * @param {String} target.os - linux, darwin, windows, *bsd
+   * @param {String} target.arch - arm64, x86_64, ppc64le
+   * @param {String} target.libc - none, libc, gnu, musl, bionic, msvc
+   * @param {String} target.triplet - os-vendor-arch-libc
+   * @param {Error} target.error
   */
-  bc.enumerateLatestVersions = function (projInfo, hostTarget) {
-    let lexPrefix = '';
-    let matchInfo = Lexver.matchSorted(projInfo.lexvers, lexPrefix);
-    let verInfo = {
-      default: projInfo.lexversMap[matchInfo.default],
-      previous: projInfo.lexversMap[matchInfo.previous],
-      stable: projInfo.lexversMap[matchInfo.stable],
-      latest: projInfo.lexversMap[matchInfo.latest],
-    };
-
-    return verInfo;
-  };
-
-  /**
-   * @param {ProjectInfo} projInfo
-   * @param {HostTarget} hostTarget
-   * @param {VersionTarget} verTarget
-   */
-  bc.findMatchingPackages = function (projInfo, hostTarget, verTarget) {
-    let matchInfo = bc._enumerateVersions(projInfo, verTarget.version);
+  bc.findMatchingPackages = function (pkgInfo, hostTarget, verTarget) {
+    let matchInfo = bc._enumerateVersions(pkgInfo, verTarget.version);
    let triplets = bc._enumerateTriplets(hostTarget);
    //console.log('dbg: matchInfo', matchInfo);

    if (matchInfo) {
      for (let _triplet of triplets) {
-        let targetReleases = projInfo.releasesByTriplet[_triplet];
+        let targetReleases = pkgInfo.releasesByTriplet[_triplet];
        if (!targetReleases) {
          continue;
        }
@@ -833,7 +756,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
        // Make sure that these releases are the expected version
        // (ex: jq1.7 => darwin-arm64-libc, jq1.6 => darwin-x86_64-libc)
        for (let matchver of matchInfo.matches) {
-          let ver = projInfo.lexversMap[matchver] || matchver;
+          let ver = pkgInfo.lexversMap[matchver] || matchver;
          let packages = targetReleases[ver];
          if (!packages) {
            continue;
@@ -842,7 +765,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
          let match = {
            triplet: _triplet,
            packages: packages,
-            latest: projInfo.versions[0],
+            latest: pkgInfo.versions[0],
            version: ver,
            versions: matchInfo,
          };
@@ -854,7 +777,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    }

    for (let _triplet of triplets) {
-      let targetReleases = projInfo.releasesByTriplet[_triplet];
+      let targetReleases = pkgInfo.releasesByTriplet[_triplet];
      if (!targetReleases) {
        continue;
      }
@@ -873,7 +796,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
      // Make sure that these releases are the expected version
      // (ex: jq1.7 => darwin-arm64-libc, jq1.6 => darwin-x86_64-libc)
      for (let matchver of lexvers) {
-        let ver = projInfo.lexversMap[matchver] || matchver;
+        let ver = pkgInfo.lexversMap[matchver] || matchver;
        let packages = targetReleases[ver];
        //console.log('dbg: packages', packages);
        if (!packages) {
@@ -889,7 +812,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
          let match = {
            triplet: _triplet,
            packages: packages,
-            latest: projInfo.versions[0],
+            latest: pkgInfo.versions[0],
            version: ver,
            versions: matchInfo,
          };
@@ -908,7 +831,7 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
        let match = {
          triplet: _triplet,
          packages: packages,
-          latest: projInfo.versions[0],
+          latest: pkgInfo.versions[0],
          version: ver,
          versions: matchInfo,
        };
@@ -955,12 +878,12 @@ BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
    return triplets;
  };

-  bc._enumerateVersions = function (projInfo, ver) {
+  bc._enumerateVersions = function (pkgInfo, ver) {
    if (!ver) {
      return null;
    }
    let lexPrefix = Lexver.parsePrefix(ver);
-    let matchInfo = Lexver.matchSorted(projInfo.lexvers, lexPrefix);
+    let matchInfo = Lexver.matchSorted(pkgInfo.lexvers, lexPrefix);

    return matchInfo;
  };
--- a/_webi/builds.js
+++ b/_webi/builds.js
@@ -20,7 +20,7 @@ bc.freshenRandomPackage(600 * 1000);
 Builds.init = async function () {
  bc.freshenRandomPackage(600 * 1000);

-  let dirs = await bc.getProjectsByType();
+  let dirs = await bc.getProjects();
  let projNames = Object.keys(dirs.valid);

  let parallel = 25;
@@ -34,8 +34,7 @@ Builds.init = async function () {
  }
 };

-Builds.enumerateLatestVersions = bc.enumerateLatestVersions;
-Builds.findMatchingPackages = bc.findMatchingPackages;
-Builds.getPackage = bc.getPackages;
 Builds.getProjectType = bc.getProjectType;
+Builds.getPackage = bc.getPackages;
+Builds.findMatchingPackages = bc.findMatchingPackages;
 Builds.selectPackage = bc.selectPackage;
--- a/_webi/curl-pipe-bootstrap.tpl.sh
+++ b/_webi/curl-pipe-bootstrap.tpl.sh
@@ -267,23 +267,12 @@ webi_bootstrap() { (
 fn_checksum() {
    a_filepath="${1}"

-    if command -v sha1sum > /dev/null; then
-        sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
-    fi
-
+    cmd_shasum='sha1sum'
    if command -v shasum > /dev/null; then
-        shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
+        cmd_shasum='shasum'
    fi

-    if command -v sha1 > /dev/null; then
-        sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-        return 0
-    fi
-
-    echo >&2 "    warn: no sha1 sum program"
-    date '+%F %H:%M'
+    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
 }

 ##############################################
--- a/_webi/installers.js
+++ b/_webi/installers.js
@@ -14,16 +14,11 @@ function padScript(txt) {

 var BAD_SH_RE = /[<>'"`$\\]/;
 Installers.renderBash = async function (
-  pkgdir,
-  rel,
-  { baseurl, pkg, tag, ver, os = '', arch = '', libc = '', formats, latest },
+  baseurl,
+  posixTemplate,
+  buildRequest,
+  buildMatch,
 ) {
-  if (!Array.isArray(formats)) {
-    formats = [];
-  }
-  if (!tag) {
-    tag = '';
-  }
  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.sh'), 'utf8');
  installTxt = padScript(installTxt);
  var vers = rel.version.split('.');
@@ -93,7 +88,7 @@ Installers.renderBash = async function (
    ['WEBI_GIT_TAG', rel.git_tag], // TODO replace with branch
    ['WEBI_LTS', rel.lts],
    ['WEBI_CHANNEL', rel.channel],
-    ['WEBI_EXT', rel.ext],
+    ['WEBI_EXT', rel.ext.replace(/tar.*/, 'tar')],
    ['WEBI_FORMATS', formats.join(',')],
    ['WEBI_PKG_URL', rel.download],
    ['WEBI_PKG_PATHNAME', pkgFile],
@@ -131,17 +126,18 @@ Installers.renderBash = async function (
  return tplTxt;
 };

+/**
+ * @param {String} pkgdir
+ * @param {String} baseurl
+ * @param {BuildRequest} buildRequest
+ * @param {BuildMatch} buildMatch
+ */
 Installers.renderPowerShell = async function (
-  pkgdir,
-  rel,
-  { baseurl, pkg, tag, ver, os, arch, libc = '', formats },
+  baseurl,
+  pwshTemplate,
+  buildRequest,
+  buildMatch,
 ) {
-  if (!Array.isArray(formats)) {
-    formats = [];
-  }
-  if (!tag) {
-    tag = '';
-  }
  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.ps1'), 'utf8');
  installTxt = padScript(installTxt);
  /*
--- a/_webi/lint-builds.js
+++ b/_webi/lint-builds.js
@@ -125,7 +125,6 @@ let bc = BuildsCacher.create({
 });

 async function main() {
-  /* jshint maxcomplexity: 25 */
  // TODO
  //     node ./_webi/lint-builds.js caddy@beta 'x86_64/unknown Darwin libc'
  //
@@ -185,7 +184,6 @@ async function main() {
        // non-build file
        continue;
      }
-
      if (target.error) {
        let e = target.error;
        if (e.code === 'E_BUILD_NO_PATTERN') {
@@ -197,12 +195,6 @@ async function main() {
        throw e;
      }

-      if (target.unknownTerms?.length) {
-        let msg = `${projInfo.name}: unrecognized term(s) '${target.unknownTerms}' in '${build.download}'`;
-        let err = new Error(msg);
-        throw err;
-      }
-
      triples.push(target.triplet);
      // if (!build.version) {
      //   throw new Error(`no version for ${pkg.name} ${build.name}`);
--- a/_webi/package-install.tpl.sh
+++ b/_webi/package-install.tpl.sh
@@ -197,32 +197,20 @@ __bootstrap_webi() {
        my_dl_rel="$(
            fn_sub_home "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
        )"
-        if test "$WEBI_EXT" = "tar.zst"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            unzstd -c --keep "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" | tar xf -
-        elif test "$WEBI_EXT" = "tar.xz"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            unxz -c -k "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" | tar xf -
-        elif test "$WEBI_EXT" = "tar.gz"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            tar xzf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "tar.bz2"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            tar xjf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "tar"; then
+        if [ "tar" = "$WEBI_EXT" ]; then
            echo "    Extracting $(t_path "${my_dl_rel}")"
            tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "zip" || test "$WEBI_EXT" = "app.zip"; then
+        elif [ "zip" = "$WEBI_EXT" ]; then
            echo "    Extracting $(t_path "${my_dl_rel}")"
            unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
-        elif test "$WEBI_EXT" = "exe"; then
+        elif [ "exe" = "$WEBI_EXT" ]; then
            echo "    Moving $(t_path "${my_dl_rel}")"
            echo "      to $(t_path "$(fn_sub_home "$(pwd)")")"
            mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif test "$WEBI_EXT" = "git"; then
+        elif [ "git" = "$WEBI_EXT" ]; then
            echo "    Moving $(t_path "${my_dl_rel}")"
            mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif test "$WEBI_EXT" = "xz"; then
+        elif [ "xz" = "$WEBI_EXT" ]; then
            echo "    Inflating $(t_path "${my_dl_rel}")"
            unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
        else
@@ -788,23 +776,12 @@ webi_upgrade() { (
 fn_checksum() {
    a_filepath="${1}"

-    if command -v sha1sum > /dev/null; then
-        sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
-    fi
-
+    cmd_shasum='sha1sum'
    if command -v shasum > /dev/null; then
-        shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
+        cmd_shasum='shasum'
    fi

-    if command -v sha1 > /dev/null; then
-        sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-        return 0
-    fi
-
-    echo >&2 "    warn: no sha1 sum program"
-    date '+%F %H:%M'
+    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
 }

 ##############################################
--- a/_webi/serve-installer.js
+++ b/_webi/serve-installer.js
@@ -10,27 +10,53 @@ let Builds = require('./builds.js');
 let Installers = require('./installers.js');

 InstallerServer.INSTALLERS_DIR = Path.join(__dirname, '..');
+
+/**
+ * @typedef BuildRequest
+ * @prop {String} unameAgent
+ * @prop {String} projectName
+ * @prop {String} tag
+ * @prop {Array<String>} formats
+ */
+
 InstallerServer.serveInstaller = async function (
  baseurl,
-  ua,
-  pkg,
+  ua, // TODO nix
+  unameAgent,
+  pkg, // TODO nix
+  projectName,
  tag,
-  ext,
+  ext, // TODO nix
+  installerType,
  formats,
-  libc,
 ) {
-  let unameAgent = ua;
-  let projectName = pkg;
-  let [rel, tmplParams] = await InstallerServer.helper({
-    unameAgent,
+  if (!unameAgent) {
+    unameAgent = ua;
+  }
+  if (!projectName) {
+    projectName = pkg;
+  }
+  if (!installerType) {
+    installerType = ext;
+  }
+  let buildRequest = {
    projectName,
    tag,
+    unameAgent,
    formats,
-    libc,
-  });
-  Object.assign(tmplParams, {
-    baseurl,
-  });
+  };
+
+  let hostTarget = {};
+  let buildMatch;
+  {
+    let terms = unameAgent.split(/[\s\/]+/g);
+    void HostTargets.termsToTarget(hostTarget, terms);
+    buildMatch = await InstallerServer.getBuild(buildRequest, hostTarget);
+  }
+  Object.assign(tmplParams, { baseurl, });
+
+  console.log('dbg: buildPkg', rel);
+  console.log('dbg: tmplParams', tmplParams);

  var pkgdir = Path.join(InstallerServer.INSTALLERS_DIR, projectName);
  if ('ps1' === ext) {
@@ -41,12 +67,15 @@ InstallerServer.serveInstaller = async function (

 // TODO put some of this in a middleware? or common function?
 // TODO maybe move package/version/lts/channel detection into getReleases
+/**
+ * @param {BuildRequest}
+ * @returns {BuildMatch}
+ */
 InstallerServer.helper = async function ({
  unameAgent,
  projectName,
  tag,
  formats,
-  libc,
 }) {
  console.log(`dbg: Installer User-Agent: ${unameAgent}`);

@@ -133,9 +162,6 @@ InstallerServer.helper = async function ({
  };

  let hasOs = projInfo.oses.includes(hostTarget.os);
-  if (!hasOs) {
-    hasOs = projInfo.oses.includes('ANYOS');
-  }
  if (!hasOs) {
    let pkg1 = Object.assign(buildTargetInfo, errPackage);
    return [pkg1, tmplParams];
@@ -165,10 +191,11 @@ InstallerServer.helper = async function ({
  if (version.startsWith('v')) {
    version = version.slice(1);
  }
+  let ver = version;

-  buildPkg = Object.assign(buildTargetInfo, buildPkg, { ext, version });
-  console.log('dbg: buildPkg', buildPkg);
-  console.log('dbg: tmplParams', tmplParams);
+  buildPkg = Object.assign(buildTargetInfo, buildPkg, { ext, version, tag });
+  Object.assign(tmplParams, { tag, ext, ver, version });
+  //console.log(`VERSION: ${version}`, ext);
  return [buildPkg, tmplParams];
 };

--- a/_webi/test.js
+++ b/_webi/test.js
@@ -32,7 +32,7 @@ if (/\b-?-h(elp)?\b/.test(process.argv.join(' '))) {
 var os = require('os');
 var fs = require('fs');
 var path = require('path');
-var Builds = require('./builds.js');
+var Releases = require('./transform-releases.js');
 var Installers = require('./installers.js');
 var ServeInstaller = require('./serve-installer.js');

@@ -65,8 +65,7 @@ console.info('Has the necessary files?');
  });

 console.info('');
-let projName = pkgdir.split('/').filter(Boolean).pop();
-Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
+Releases.get(path.join(process.cwd(), pkgdir)).then(async function (all) {
  var pkgname = path.basename(pkgdir.replace(/\/$/, ''));
  var nodeOs = os.platform();
  var nodeOsRelease = os.release();
@@ -82,20 +81,29 @@ Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
  }
  var formats = ['exe', 'xz', 'tar', 'zip', 'git'];

+  let unameAgent = `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`;
+  console.log(`DEBUG: ${unameAgent}`);
  let [rel, opts] = await ServeInstaller.helper({
-    unameAgent: `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`,
+    unameAgent: unameAgent,
    projectName: pkgname,
    tag: pkgtag || '',
    formats: formats,
    libc: nodeLibc,
  });
+  console.log('DEBUG opts:');
+  console.log(opts);
  Object.assign(
+    rel,
    {
-      ver: '',
+      version: '{test-version}',
+      git_tag: '{test-git-tag}',
+      git_commit_hash: '{test-git-commit-hash}',
      lts: null,
-      channel: '',
-      os: '',
-      arch: '',
+      channel: '{test-channel}',
+      date: '1970-01-01T00:00:00Z',
+      os: '{test-os}',
+      arch: '{test-arch}',
+      ext: '{test-ext}',
      limit: 0,
    },
    opts,
--- a/brew/brew-update-service-install
+++ b/brew/brew-update-service-install
@@ -6,23 +6,15 @@ main() { (
    sed '1,/^#~\/.local\/bin\/brew-updater/d' "${0}" > ~/.local/bin/brew-update-hourly
    chmod a+x ~/.local/bin/brew-update-hourly

-    echo "Checking for serviceman..."
-    if ! command -v serviceman > /dev/null; then
-        "$HOME/.local/bin/webi" serviceman
-        export PATH="$HOME/.local/bin:$PATH"
-        serviceman --version
-    fi
-
    env PATH="$PATH" serviceman add --user \
        --workdir ~/.local/opt/brew/ \
        --name sh.brew.updater -- \
        ~/.local/bin/brew-update-hourly
 ); }

-if ! main; then
-    exit 1
+if main; then
+    exit 0
 fi
-exit 0

 #~/.local/bin/brew-updater
 #!/bin/sh
--- a/commandlinetools/README.md
+++ b/commandlinetools/README.md
@@ -1,55 +0,0 @@
---
-title: XCode Command Line Tools
-homepage: https://webinstall.dev/commandlinetools
-tagline: |
-  The XCode Command Line Tools include git, swift, make, clang, and other developer tools
---
-
-## Cheat Sheet
-
-> The developer tools provided by Apple for macOS.
-
- git
- swift
- make
- clang
- etc
-
-This is also part of [webi-essentials](../webi-essentials/).
-
-## Table of Contents
-
- Files
- Manual Install
-  - macOS
-  - Linux
-  - Alpine
-  - Windows
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```sh
-/Library/Developer/CommandLineTools/
-```
-
-### How to Install Manually
-
-It's very easy to start the installer:
-
-```sh
-xcode-select --install
-```
-
-The trick is to also have a mechanism to know when it has finished:
-
-```sh
-while ! test -x /Library/Developer/CommandLineTools/usr/bin/git ||
-    ! test -x /Library/Developer/CommandLineTools/usr/bin/make; do
-    sleep 0.25
-done
-
-echo "Command Line Tools Installed"
-```
--- a/commandlinetools/install.sh
+++ b/commandlinetools/install.sh
@@ -1,62 +0,0 @@
-#!/bin/sh
-set -e
-set -u
-
-fn_install_xcode_commandlinetools() { (
-    b_os="$(uname -s)"
-    if test "${b_os}" != 'Darwin'; then
-        echo >&2 'XCode Command Line Tools are for macOS only'
-        return 1
-    fi
-
-    # streamline the output to be pretty
-    fn_check_pkg '/Library/Developer/CommandLineTools/usr/bin/clang' 'clang'
-    fn_check_pkg '/Library/Developer/CommandLineTools/usr/bin/git' 'git'
-    fn_check_pkg '/Library/Developer/CommandLineTools/usr/bin/make' 'make'
-    echo >&2 ""
-
-    # git
-    if xcode-select -p > /dev/null 2> /dev/null; then
-        echo ""
-        return 0
-    fi
-
-    cmd_xcode_cli_tools_install="xcode-select --install"
-    echo "    Running $(t_cmd "${cmd_xcode_cli_tools_install}")"
-    $cmd_xcode_cli_tools_install 2> /dev/null
-    echo ""
-    echo ">>> $(t_attn 'ACTION REQUIRED') <<<"
-    echo ""
-    echo "        $(t_attn "Click") '$(t_bold 'Install')' $(t_attn "in the pop-up")"
-    echo "        (it may appear $(t_em 'under') this window)"
-    echo ""
-    echo "^^^ $(t_attn 'ACTION REQUIRED') ^^^"
-    echo ""
-    printf "    waiting %s to finish installing Command Line Developer Tools ..." "$(t_em 'for you')"
-    while ! test -x /Library/Developer/CommandLineTools/usr/bin/git ||
-        ! test -x /Library/Developer/CommandLineTools/usr/bin/make; do
-        sleep 0.25
-    done
-    echo " $(t_info 'OK')"
-    echo "    Installed to $(t_path '/Library/Developer/CommandLineTools/')"
-    sleep 1
-); }
-
-fn_check_pkg() { (
-    a_pkg="${1}"
-    a_pkgname="${2:-$a_pkg}"
-
-    printf >&2 '    %s %s %s' \
-        "$(t_dim "Checking for")" \
-        "$(t_pkg "${a_pkgname}")" \
-        "$(t_dim "...")"
-
-    if command -v "${a_pkg}" > /dev/null; then
-        echo >&2 " $(t_dim 'OK')"
-        return 0
-    fi
-
-    echo >&2 ' missing'
-); }
-
-fn_install_xcode_commandlinetools
--- a/dashcore-utils/dash.example.conf
+++ b/dashcore-utils/dash.example.conf
@@ -1,14 +1,7 @@
-# for exposing RPCs, building APIs
 txindex=1
 addressindex=1
 timestampindex=1
 spentindex=1
-# listen as server (explicit default)
-listen=1
-# because its already run as a service (systemd, openrc)
-daemon=0
-# for evonodes
-#server=1

 [main]
 rpcuser=RPCUSER_MAIN
--- a/dashcore-utils/dashd-hd-service-install
+++ b/dashcore-utils/dashd-hd-service-install
@@ -17,7 +17,7 @@ fn_usage() { (
 ); }

 fn_datadir_help() { (
-    my_vol="${1}"
+    my_vol="${1:-}"
    my_user="$(
        id -n -u
    )"
@@ -25,7 +25,6 @@ fn_datadir_help() { (
        id -n -g
    )"

-    my_mount="$(dirname "${my_vol}")"
    echo >&2 ""
    echo >&2 "ERROR"
    echo >&2 "        '${my_vol}' is not writable"
@@ -33,8 +32,8 @@ fn_datadir_help() { (
    echo >&2 "SOLUTION"
    echo >&2 "        1. Mount a large (50gb+) volume"
    echo >&2 ""
-    echo >&2 "              sudo mkdir -p ${my_mount}"
-    echo >&2 "              sudo mount /dev/sdx1 ${my_mount}"
+    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 ""
@@ -112,7 +111,7 @@ fn_srv_install() { (
        echo "Installing 'serviceman'..."
        echo ""
        {
-            "$HOME/.local/bin/webi" serviceman
+            curl -fsSL "${WEBI_HOST}/serviceman" | sh
        } > /dev/null

        # shellcheck disable=SC1090
--- a/dashcore-utils/install.sh
+++ b/dashcore-utils/install.sh
@@ -5,38 +5,32 @@ set -u
 __install_dashcore_utils() {
    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dash-qt-hd" \
-        "$HOME/.local/bin/dash-qt-hd" \
-        "dash-qt-hd"
+        "$HOME/.local/bin/dash-qt-hd"
    chmod a+x "$HOME/.local/bin/dash-qt-hd"

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dash-qt-testnet" \
-        "$HOME/.local/bin/dash-qt-testnet" \
-        "dash-qt-testnet"
+        "$HOME/.local/bin/dash-qt-testnet"
    chmod a+x "$HOME/.local/bin/dash-qt-testnet"

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dashd-hd" \
-        "$HOME/.local/bin/dashd-hd" \
-        "dashd-hd"
+        "$HOME/.local/bin/dashd-hd"
    chmod a+x "$HOME/.local/bin/dashd-hd"

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dashd-testnet" \
-        "$HOME/.local/bin/dashd-testnet" \
-        "dashd-testnet"
+        "$HOME/.local/bin/dashd-testnet"
    chmod a+x "$HOME/.local/bin/dashd-testnet"

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dashd-hd-service-install" \
-        "$HOME/.local/bin/dashd-hd-service-install" \
-        "dashd-hd-service-install"
+        "$HOME/.local/bin/dashd-hd-service-install"
    chmod a+x "$HOME/.local/bin/dashd-hd-service-install"

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dashd-testnet-service-install" \
-        "$HOME/.local/bin/dashd-testnet-service-install" \
-        "dashd-testnet-service-install"
+        "$HOME/.local/bin/dashd-testnet-service-install"
    chmod a+x "$HOME/.local/bin/dashd-testnet-service-install"

    if ! test -e "${HOME}/.dashcore"; then
@@ -50,8 +44,7 @@ __install_dashcore_utils() {

    webi_download \
        "$WEBI_HOST/packages/dashcore-utils/dash.example.conf" \
-        "$HOME/.dashcore/dash.example.conf" \
-        "dash.example.conf"
+        "$HOME/.dashcore/dash.example.conf"

    if ! grep -q rpcuser ~/.dashcore/dash.conf; then
        cat ~/.dashcore/dash.example.conf >> ~/.dashcore/dash.conf
--- a/dashd/README.md
+++ b/dashd/README.md
@@ -24,7 +24,7 @@ install:
 ~/.config/envman/PATH.env
 ~/.dashcore/dash.conf
 ~/.dashcore/wallets/
-~/.local/bin/dashd-hd-service-install
+~/.local/bin/bin/dashd-hd-service-install
 ~/.local/opt/dashcore/
 /mnt/<BLK_VOL>/dashcore/
 ```
--- a/ffprobe/releases.js
+++ b/ffprobe/releases.js
@@ -1,45 +0,0 @@
-'use strict';
-
-var path = require('path');
-
-var github = require('../_common/github.js');
-var owner = 'eugeneware';
-var repo = 'ffmpeg-static';
-
-module.exports = function (request) {
-  return github(request, owner, repo).then(function (all) {
-    all.releases = all.releases
-      .filter(function (rel) {
-        let isFfmpeg = rel.name.includes('ffmpeg');
-        if (!isFfmpeg) {
-          return;
-        }
-
-        // remove README and LICENSE
-        return !['.README', '.LICENSE'].includes(path.extname(rel.name));
-      })
-      .map(function (rel) {
-        rel.version = rel.version.replace(/^b/, '');
-
-        if (/win32/.test(rel.name)) {
-          rel.os = 'windows';
-          rel.ext = 'exe';
-        }
-        if (/ia32/.test(rel.name)) {
-          rel.arch = '386';
-        } else if (/x64/.test(rel.name)) {
-          rel.arch = 'amd64';
-        }
-
-        return rel;
-      });
-    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));
-  });
-}
--- a/fish/install.sh
+++ b/fish/install.sh
@@ -3,51 +3,17 @@ set -e
 set -u

 if command -v fish > /dev/null; then
-    if ! test -r ~/.config/fish/config.fish; then
+    if [ ! -e ~/.config/fish/config.fish ]; then
        mkdir -p ~/.config/fish
        touch ~/.config/fish/config.fish
        chmod 0600 ~/.config/fish/config.fish
    fi
-else
-    if command -v sudo > /dev/null; then
-        my_answer='n'
-        if command -v apt > /dev/null; then
-            echo ""
-            echo "ERROR"
-            echo "    No Webi installer for fish on Linux yet."
-            echo ""
-            echo "SOLUTION"
-            echo "    Would you like to install with apt?"
-            echo "    sudo apt install -y fish"
-            echo ""
-            printf "Install with sudo and apt [Y/n]? "
-        elif command -v apk > /dev/null; then
-            echo ""
-            echo "ERROR"
-            echo "    No Webi installer for fish on Alpine yet."
-            echo ""
-            echo "SOLUTION"
-            echo "    Would you like to install with apk?"
-            echo "    sudo apk add --no-cache fish"
-            echo ""
-            printf "Install with sudo and apk [Y/n]? "
-        elif test "Darwin" != "$(uname -s)"; then
-            echo "No fish installer for Linux yet."
-            exit 1
-        fi
+fi

-        read -r my_answer < /dev/tty
-        if test -z "${my_answer}" ||
-            test "${my_answer}" = "Y" ||
-            test "${my_answer}" = "y"; then
-            sudo apt install -y fish
-        else
-            exit 1
-        fi
-    elif test "Darwin" != "$(uname -s)"; then
-        echo "No fish installer for Linux yet."
-        exit 1
-    fi
+if [ "Darwin" != "$(uname -s)" ]; then
+    echo "No fish installer for Linux yet. Try this instead:"
+    echo "    sudo apt install -y fish"
+    exit 1
 fi

 ################
@@ -71,10 +37,6 @@ pkg_src="$pkg_src_cmd"
 # pkg_install must be defined by every package

 _macos_post_install() {
-    if test "Darwin" != "$(uname -s)"; then
-        return 0
-    fi
-
    if ! [ -e "$HOME/.local/bin/fish" ]; then
        return 0
    fi
@@ -109,10 +71,8 @@ _macos_post_install() {
    killall cfprefsd
 }

-if test "Darwin" = "$(uname -s)"; then
-    # always try to reset the default shells
-    _macos_post_install
-fi
+# always try to reset the default shells
+_macos_post_install

 pkg_install() {
    mv fish.app/Contents/Resources/base/usr/local "$HOME/.local/opt/fish-v${WEBI_VERSION}"
@@ -124,10 +84,7 @@ pkg_post_install() {
    webi_post_install

    # try again to update default shells, now that all files should exist
-    if test "Darwin" = "$(uname -s)"; then
-        # always try to reset the default shells
-        _macos_post_install
-    fi
+    _macos_post_install

    if [ ! -e ~/.config/fish/config.fish ]; then
        mkdir -p ~/.config/fish
--- a/flutter/releases.js
+++ b/flutter/releases.js
@@ -66,10 +66,10 @@ module.exports = async function (request) {
      json: true,
    });

-    let osBaseUrl = resp.body.base_url;
-    let osReleases = resp.body.releases;
+    let body = resp.body;
+    all.download = `${body.base_url}/{{ download }}`;

-    for (let asset of osReleases) {
+    for (let asset of body.releases) {
      if (!channelMap[asset.channel]) {
        channelMap[asset.channel] = true;
      }
@@ -81,8 +81,7 @@ module.exports = async function (request) {
        channel: asset.channel,
        date: asset.release_date.replace(/T.*/, ''),
        //sha256: asset.sha256,
-        download: `${osBaseUrl}/${asset.archive}`,
-        _filename: asset.archive,
+        download: asset.archive,
      });
    }
  }
--- a/git/install.sh
+++ b/git/install.sh
@@ -14,57 +14,11 @@ __init_git() {
        echo >&2 "       for example, try: xcode-select --install"
        # sudo xcodebuild -license accept
    else
-        fn_prompt_sudo_install git
+        echo >&2 "Error: to install 'git' on Linux use the built-in package manager."
+        echo >&2 "       for example, try: sudo apt install -y git"
    fi

    exit 1
 }

-fn_prompt_sudo_install() {
-    a_pkg="${1}"
-
-    if command -v sudo > /dev/null; then
-        my_answer='n'
-        cmd_pkg_add=''
-        if command -v apt > /dev/null; then
-            echo ""
-            echo "ERROR"
-            echo "    No Webi installer for ${a_pkg} on Linux yet."
-            echo ""
-            echo "SOLUTION"
-            echo "    Would you like to install with apt?"
-            echo "    sudo apt install -y ${a_pkg}"
-            echo ""
-            printf "Install with sudo and apt [Y/n]? "
-            cmd_pkg_add='sudo apt install -y'
-        elif command -v apk > /dev/null; then
-            echo ""
-            echo "ERROR"
-            echo "    No Webi installer for ${a_pkg} on Alpine yet."
-            echo ""
-            echo "SOLUTION"
-            echo "    Would you like to install with apk?"
-            echo "    sudo apk add --no-cache ${a_pkg}"
-            echo ""
-            printf "Install with sudo and apk [Y/n]? "
-            cmd_pkg_add='sudo apk add --no-cache'
-        elif test "Darwin" != "$(uname -s)"; then
-            echo "No ${a_pkg} installer for Linux yet."
-            exit 1
-        fi
-
-        read -r my_answer < /dev/tty
-        if test -z "${my_answer}" ||
-            test "${my_answer}" = "Y" ||
-            test "${my_answer}" = "y"; then
-            $cmd_pkg_add "${a_pkg}"
-        else
-            exit 1
-        fi
-    elif test "Darwin" != "$(uname -s)"; then
-        echo "No ${a_pkg} installer for Linux yet."
-        exit 1
-    fi
-}
-
 __init_git
--- a/go-essentials/install.sh
+++ b/go-essentials/install.sh
@@ -3,7 +3,7 @@ set -e
 set -u

 __run_go_essentials() {
-    if ! command -v go > /dev/null; then
+    if ! command -v go 2> /dev/null; then
        "$HOME/.local/bin/webi" "go@${WEBI_TAG}"
    fi

--- a/go/releases.js
+++ b/go/releases.js
@@ -44,7 +44,7 @@ function getAllReleases(request) {
    var goReleases = resp.body;
    var all = {
      releases: [],
-      download: '',
+      download: 'https://dl.google.com/go/{{ download }}',
    };

    goReleases.forEach((release) => {
@@ -77,7 +77,7 @@ function getAllReleases(request) {
          arch: arch,
          ext: '', // let normalize run the split/test/join
          hash: '-', // not ready to standardize this yet
-          download: `https://dl.google.com/go/${filename}`,
+          download: filename,
        });
      });
    });
--- a/julia/README.md
+++ b/julia/README.md
@@ -1,128 +0,0 @@
---
-title: Julia
-homepage: https://julialang.org/
-tagline: |
-  Julia: A Language for Data Science, Visualization, and Machine Learning
---
-
-To update or switch versions, run `webi julia@stable` (or `@v1.10`, `@beta`,
-etc).
-
-## Cheat Sheet
-
-> Julia is a programming language for Data Science - a far better alternative to
-> (or plugin for) Python when performance matters.
-
-## Table of Contents
-
- Files
- Hello World
- Compile for Distribution
- Vim Plugin
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/opt/julia/
-```
-
-### How to create a Hello World with Julia
-
-Try out the REPL by coping and pasting the code below (it'll print some nice
-ASCII art to the console):
-
-```sh
-julia -i
-```
-
-```julia
-function mandelbrot(a)
-    z = 0
-    for i=1:50
-        z = z^2 + a
-    end
-    return z
-end
-
-for y=1.0:-0.05:-1.0
-    for x=-2.0:0.0315:0.5
-        abs(mandelbrot(complex(x, y))) < 2 ? print("*") : print(" ")
-    end
-    println()
-end
-```
-
-Or write the program to `./mandelbrot.jl` and run it:
-
-```sh
-julia ./mandelbrot.jl
-```
-
-## How to Build a Distributable Binary with Julia
-
-Here's an example project that you can build:
-
-1. Clone and enter the example project
-   ```sh
-   git clone --depth=1 https://github.com/JuliaLang/PackageCompiler.jl ./PackageCompiler
-   pushd ./PackageCompiler/examples
-   ```
-2. Run Julia in project mode
-   ```sh
-   julia -q --project
-   ```
-3. Compile the binary
-   ```julia
-   using PackageCompiler
-   create_app("MyApp", "MyAppCompiled")
-   exit()
-   ```
-4. Test & Enjoy
-   ```sh
-   ./MyAppCompiled/bin/MyApp foo bar --julia-args -t4
-   ```
-
-See also:
-
- <https://docs.juliahub.com/PackageCompiler/MMV8C/2.1.16/apps.html>
- <https://github.com/JuliaLang/PackageCompiler.jl/tree/master/examples/MyApp>
-
-## How to Install the Language Server (for VSCode, Vim, etc)
-
-Open the Julia REPL and add `LanguageServer`:
-
-```sh
-julia -i
-```
-
-```jl
-using Pkg
-Pkg.add("LanguageServer")
-Pkg.add("SymbolServer")
-```
-
-You'll need to reinstall if you switch environments.
-
-## How to Install the Julia Vim Plugin
-
-`julia-vim` adds support for:
-
- Latex-to-Unicode
- jumping from between start and end of blocks with `%` \
-  (and other block jump sequences)
-
-```sh
-mkdir -p ~/.vim/pack/plugins/start
-git clone https://github.com/JuliaEditorSupport/julia-vim.git \
-    ~/.vim/pack/plugins/start/julia-vim
-```
-
-Usage Examples:
-
- `\alpha<tab>` will produce `α` \
-  (meaning typing `\alpha` and hitting the `tab` key)
- Hitting `%` on an `end` will take you to the `function` or `for`, etc
--- a/julia/install.ps1
+++ b/julia/install.ps1
@@ -1,56 +0,0 @@
-#!/usr/bin/env pwsh
-
-#################
-# Install julia #
-#################
-
-# Every package should define these variables
-$pkg_cmd_name = "julia"
-
-$pkg_dst_cmd = "$Env:USERPROFILE\.local\opt\julia\bin\julia.exe"
-$pkg_dst_bin = "$Env:USERPROFILE\.local\opt\julia\bin"
-$pkg_dst_dir = "$Env:USERPROFILE\.local\opt\julia"
-$pkg_dst = "$pkg_dst_dir"
-
-$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\julia-v$Env:WEBI_VERSION\bin\julia.exe"
-$pkg_src_dir = "$Env:USERPROFILE\.local\opt\julia-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_dir"
-
-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 "$pkg_download")) {
-    Write-Output "Downloading julia 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 julia"
-
-    # TODO: create package-specific temp directory
-    # Enter tmp
-    Push-Location .local\tmp
-
-    # Remove any leftover tmp cruft
-    Remove-Item -Path ".\julia*" -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 ".\julia*" -Destination "$pkg_src_dir"
-
-    # Exit tmp
-    Pop-Location
-}
-
-Write-Output "Copying into '$pkg_dst' from '$pkg_src'"
-Remove-Item -Path "$pkg_dst" -Recurse -ErrorAction Ignore | Out-Null
-Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse
-webi_path_add "$pkg_dst_bin"
-& "$pkg_dst_cmd" --version
--- a/julia/install.sh
+++ b/julia/install.sh
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# shellcheck disable=SC2034
-# "'pkg_cmd_name' appears unused. Verify it or export it."
-
-__init_julia() {
-    set -e
-    set -u
-
-    ##################
-    # Install julia #
-    ##################
-
-    # Every package should define these 6 variables
-    pkg_cmd_name="julia"
-
-    pkg_dst_cmd="$HOME/.local/opt/julia/bin/julia"
-    pkg_dst_dir="$HOME/.local/opt/julia"
-    pkg_dst="$pkg_dst_dir"
-
-    pkg_src_cmd="$HOME/.local/opt/julia-v$WEBI_VERSION/bin/julia"
-    pkg_src_dir="$HOME/.local/opt/julia-v$WEBI_VERSION"
-    pkg_src="$pkg_src_dir"
-
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/julia-v3.27.0/
-        mkdir -p "$(dirname "${pkg_src_dir}")"
-
-        # mv ./julia-*/ ~/.local/opt/julia-v3.27.0/
-        mv ./julia-*/ "${pkg_src_dir}"
-    }
-
-    # pkg_get_current_version is recommended, but not required
-    pkg_get_current_version() {
-        # 'julia --version' has output in this format:
-        #       julia version 1.10.0-rc1
-        # This trims it down to just the version number:
-        #       1.10.0-rc1
-        julia --version 2> /dev/null |
-            head -n 1 |
-            cut -d ' ' -f 3
-    }
-
-}
-
-__init_julia
--- a/julia/releases.js
+++ b/julia/releases.js
@@ -1,145 +0,0 @@
-'use strict';
-
-var osMap = {
-  winnt: 'windows',
-  mac: 'darwin',
-};
-var archMap = {
-  armv7l: 'armv7',
-  i686: 'x86',
-  powerpc64le: 'ppc64le',
-};
-
-async function getAllReleases() {
-  let all = {
-    releases: [],
-    download: '',
-    _names: ['julia', 'macaarch64'],
-  };
-
-  let resp = await fetch(
-    'https://julialang-s3.julialang.org/bin/versions.json',
-    {
-      headers: {
-        Accept: 'application/json',
-      },
-    },
-  );
-  let buildsByVersion = await resp.json();
-
-  /*
-      {
-        "url": "https://julialang-s3.julialang.org/bin/mac/aarch64/1.9/julia-1.9.4-macaarch64.tar.gz",
-        "triplet": "aarch64-apple-darwin14",
-        "kind": "archive",
-        "arch": "aarch64",
-        "asc": "-----BEGIN PGP SIGNATURE-----\n\niQIzBAABCAAdFiEENnPfUp2QSUd/drN1ZuPH3APW5JUFAmVTQBcACgkQZuPH3APW\n5JWUqw//QF/CJLAxXZdcXqpBulLUs/AX+x/8aERGcKxZqfeYOwA5efOzma8sASa/\nUzYCLp9E31x/RMDoZah6vPRRjBR+uVI6CLlXCCCmbAJP3lD2vlcY9LKe2/7s3Ba8\nhwITRaL6R5zNr+YfSHW1Hoj2tWgAQh9Y+Te7bP3jzwp5dlFygFO0pzoN+aeJbPNA\nbgT0ry8tgh78/tgNjgt4Ev3E2t3ehhrDGK4tgkkKieO6sdFz8jOacZVZkR1kLVEg\nMBIqmqZfk+5/HMf/6gHwd5GOXW8+GakN7vYXO+9VFETA2EiD5Z5k4Edq/VrNCn4O\npC6WHpBmVBBYX4aQtHkJyQaV8PtFd1j9338jUWlDaa6BVtX2hjRtU1k1oLZB1TTX\nl4awzYgFqdCRnFmOtzTdMDBcfedOiIHdTyxXPjJCX3i0GXmeuk89e5dE4P6sTT9n\n24GeBVQgMaXuNorg9L0oKrsQ8RDT20yEnVbfhy4Cvoq7dNIks6IxLZt10tjJFp1j\n0oJ5f6KucGyqFM9UhXRcuLj8Z+Q+JDzBs5c2pPe/bEzv6nChRNv252e5dve17esg\nK7tHkhXzM+6wl60oyRtpWghOubXyBDsNu1MH3qC9lWy3wmWuMN7no+yX0vGFyhMT\naxjLJSeYdccKD3SuzYotp3XwBKk05PFX9lWy0vuIjVj1sGWcES8=\n=G1tO\n-----END PGP SIGNATURE-----\n",
-        "sha256": "67542975e86102eec95bc4bb7c30c5d8c7ea9f9a0b388f0e10f546945363b01a",
-        "size": 119559478,
-        "version": "1.9.4",
-        "os": "mac",
-        "extension": "tar.gz"
-      }
-   */
-
-  let versions = Object.keys(buildsByVersion);
-  for (let version of versions) {
-    let release = buildsByVersion[version];
-
-    // let odd = isOdd(asset.filename);
-    // if (odd) {
-    //   return;
-    // }
-
-    for (let build of release.files) {
-      // // For debugging
-      // let paths = build.url.split('/');
-      // let extlen = build.extension.length + 1;
-      // let name = paths.at(-1);
-      // name = name.replace(`-${build.version}`, '');
-      // name = name.slice('julia-'.length);
-      // name = name.slice(0, -extlen);
-      // console.log(`name: ${name}`);
-
-      // console.log(`triplet: ${build.triplet}`);
-      // console.log(`arch: ${build.arch}`);
-      // console.log(`os: ${build.os}`);
-      // console.log(`kind: ${build.kind}`);
-      // console.log(`extension: ${build.extension}`);
-      // console.log(`version: ${build.version}`);
-
-      if (build.kind === 'installer') {
-        continue;
-      }
-
-      let arch = archMap[build.arch] || build.arch || '-';
-      let os = osMap[build.os] || build.os || '-';
-      let libc = '';
-      let hardMusl = /\b(musl)\b/.test(build.url);
-      if (hardMusl) {
-        libc = 'musl';
-      } else if (os === 'linux') {
-        libc = 'gnu';
-      }
-
-      let webiBuild = {
-        version: build.version,
-        _version: build.version,
-        lts: false,
-        channel: '', // autodetect by filename (-beta1, -alpha1, -rc1)
-        date: '1970-01-01', // the world may never know
-        os: os,
-        arch: arch,
-        libc: libc,
-        _musl: hardMusl,
-        ext: '', // let normalize run the split/test/join
-        hash: '-', // build.sha256 not ready to standardize this yet
-        download: build.url,
-      };
-      all.releases.push(webiBuild);
-    }
-  }
-
-  all.releases.sort(sortByVersion);
-
-  return all;
-}
-
-function sortByVersion(a, b) {
-  let [aVer, aPre] = a.version.split('-');
-  let [bVer, bPre] = b.version.split('-');
-
-  let aVers = aVer.split('.');
-  let bVers = bVer.split('.');
-  for (let i = 0; i < 3; i += 1) {
-    aVers[i] = aVers[i].padStart(4, '0');
-    bVers[i] = bVers[i].padStart(4, '0');
-  }
-
-  aVer = aVers.join('.');
-  if (aPre) {
-    aVer += `-${aPre}`;
-  }
-  bVer = bVers.join('.');
-  if (bPre) {
-    bVer += `-${aPre}`;
-  }
-
-  if (aVer > bVer) {
-    return -1;
-  }
-  if (aVer < bVer) {
-    return 1;
-  }
-  return 0;
-}
-
-module.exports = getAllReleases;
-
-if (module === require.main) {
-  getAllReleases().then(function (all) {
-    all = require('../_webi/normalize.js')(all);
-    all.releases = all.releases.slice(0, 10);
-    console.info(JSON.stringify(all, null, 2));
-  });
-}
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
  "name": "@webinstall/webi-installers",
-  "version": "1.1.1",
+  "version": "1.0.1",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "@webinstall/webi-installers",
-      "version": "1.1.1",
+      "version": "1.0.1",
      "license": "MPL-2.0",
      "dependencies": {
        "@root/request": "^1.9.2",
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@webinstall/webi-installers",
  "private": true,
-  "version": "1.1.1",
+  "version": "1.0.1",
  "description": "webinstall script repository",
  "main": "_webi/",
  "scripts": {
--- a/psscriptanalyzer/install.ps1
+++ b/psscriptanalyzer/install.ps1
@@ -13,7 +13,7 @@ function Repair-MissingCommand {
        Return
    }

-    & "$HOME\.local\bin\webi-pwsh.ps1" $Package
+    & $HOME\.local\bin\webi-pwsh.ps1 $Package
    $null = Sync-EnvPath
 }

--- a/pwsh-essentials/install.ps1
+++ b/pwsh-essentials/install.ps1
@@ -15,7 +15,7 @@ function Repair-MissingCommand {
        Return
    }

-    & "$HOME\.local\bin\webi-pwsh.ps1" $Package
+    & $HOME\.local\bin\webi-pwsh.ps1 $Package
    $null = Sync-EnvPath
 }

@@ -47,7 +47,7 @@ function Install-PwshEssential {
    Repair-MissingCommand -Name "PowerShell Core" -Package "pwsh" -Command "pwsh"

    # Fetch PSScriptAnalyzer (fmt, lint, fix)
-    & "$HOME\.local\bin\webi-pwsh.ps1" psscriptanalyzer
+    & $HOME\.local\bin\webi-pwsh.ps1 psscriptanalyzer

    # Fetch shorthand commands to fmt, lint, & fix
    $ScriptNames = , "pwsh-fmt", "pwsh-fix", "pwsh-lint"
--- a/pwsh/install.sh
+++ b/pwsh/install.sh
@@ -45,10 +45,8 @@ __init_pwsh() {
    }

    pkg_done_message() {
-        # We print the version here to ensure the install completed without
-        # errors - no missing libraries, not incompatible arch, etc
-        echo ""
-        "$pkg_dst_cmd" -V
+        echo "Installed 'pwsh' at $pkg_dst"
+        pwsh -V
    }
 }

--- a/pyenv/README.md
+++ b/pyenv/README.md
@@ -7,6 +7,22 @@ tagline: |

 To update run `pyenv update`.

+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```sh
+~/.config/envman/PATH.env
+~/.pyenv/bin/
+~/.pyenv/shims/
+
+# pyenv also loads shell hooks via
+~/.bashrc
+~/.config/fish/config.fish
+~/.zshrc
+```
+
 ### How to Install pyenv on macOS

 Install Xcode tools first:
@@ -22,21 +38,11 @@ Make sure that you already have the necessary build tools installed:
 ```sh
 # required
 sudo apt update
-sudo apt install -y build-essential zlib1g-dev libssl-dev \
-                    libreadline-dev liblzma-dev
+sudo apt install -y build-essential zlib1g-dev libssl-dev

 # recommended
-sudo apt install -y libsqlite3-dev libffi-dev libbz2-dev
-```
-
-### How to Install pyenv on Alpine
-
-```sh
-sudo apk add \
-    bash \
-    build-base \
-    git \
-    zlib-dev
+sudo apt install -y libreadline-dev libsqlite3-dev \
+                    libffi-dev libbz2-dev liblzma-dev
 ```

 ## Cheat Sheet
@@ -76,34 +82,6 @@ Revert back to your system python:
 pyenv global system
 ```

-## Table of Contents
-
- Files
- List Installable Versions
- Install a Specific Version
- Install Local to a Project
- `virtualenv`s
-  - List Existing
-  - Create New
-  - Activate / Deactivate
-  - Delete
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```sh
-~/.config/envman/PATH.env
-~/.pyenv/bin/
-~/.pyenv/shims/
-
-# pyenv also loads shell hooks via
-~/.bashrc
-~/.config/fish/config.fish
-~/.zshrc
-```
-
 ### List all available python version

 ```sh
--- a/pyenv/install.sh
+++ b/pyenv/install.sh
@@ -4,13 +4,6 @@ __init_pyenv() {
    set -e
    set -u

-    b_os="$(uname -s)"
-    if test "${b_os}" = 'Darwin'; then
-        if ! test -x /Library/Developer/CommandLineTools/usr/bin/git; then
-            "$HOME/.local/bin/webi" commandlinetools
-        fi
-    fi
-
    curl -fsSL https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash

    if [ ! -f ~/.bashrc ] || ! grep -q 'pyenv init' ~/.bashrc; then
--- a/sd/install.ps1
+++ b/sd/install.ps1
@@ -45,7 +45,7 @@ IF (!(Test-Path -Path "$pkg_src_cmd")) {
    # 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 "sd-*\sd.exe" -Destination "$pkg_src_bin"
+    Move-Item -Path "b\*\release\sd.exe" -Destination "$pkg_src_bin"
    # Exit tmp
    Pop-Location
 }
--- a/ssh-pubkey/ssh-pubkey
+++ b/ssh-pubkey/ssh-pubkey
@@ -2,100 +2,43 @@
 set -e
 set -u

-fn_warn_rsa() { (
-    echo 'WARNING'
-    echo '    ~/.ssh/id_rsa is less than the required 3072 bits'
-    echo '    (some modern services will reject your key)'
-
-    echo ''
-    echo 'SOLUTION'
-    echo '    Generate a new key, and update accordingly'
-
-    my_ts="$(date -u "+%F_%H.%M.%S")"
-
-    echo ''
-    echo '    # OPTION 1: Generate a more efficient, ED25519 256-bit key'
-    echo '    #           and update your ~/.ssh/config accordingly'
-    echo "    mv ~/.ssh/id_rsa ~/.ssh/id_rsa.${my_ts}.bak"
-    # shellcheck disable=SC2016
-    echo '    ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -q -N ""'
-    echo "    echo 'Host *
-        IdentityFile ~/.ssh/id_ed25519
-        IdentityFile ~/.ssh/id_rsa.${my_ts}.bak' >> ~/.ssh/config"
-
-    echo ''
-    echo '    # OPTION 2: Generate a larger, 4096-bit RSA key"'
-    echo '    #           and update your ~/.ssh/config accordingly'
-    echo "    mv ~/.ssh/id_rsa ~/.ssh/id_rsa.${my_ts}.bak"
-    # shellcheck disable=SC2016
-    echo '    ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa -q -N ""'
-    echo "    echo 'Host *
-        IdentityFile ~/.ssh/id_rsa
-        IdentityFile ~/.ssh/id_rsa.${my_ts}.bak' >> ~/.ssh/config"
-); }
-
 main() {

-    if ! test -d ~/.ssh; then
-        mkdir -p ~/.ssh/
-        chmod 0700 ~/.ssh/
+    if [ ! -d "$HOME/.ssh" ]; then
+        mkdir -p "$HOME/.ssh/"
+        chmod 0700 "$HOME/.ssh/"
    fi

-    if ! test -f ~/.ssh/config; then
+    if [ ! -f "$HOME/.ssh/config" ]; then
        # for the benefit of VSCode
-        touch ~/.ssh/config
-        chmod 0644 ~/.ssh/config
+        touch "$HOME/.ssh/config"
+        chmod 0644 "$HOME/.ssh/config"
    fi

-    if ! test -f ~/.ssh/authorized_keys; then
-        touch ~/.ssh/authorized_keys
-        chmod 0600 ~/.ssh/authorized_keys
+    if [ ! -f "$HOME/.ssh/authorized_keys" ]; then
+        touch "$HOME/.ssh/authorized_keys"
+        chmod 0600 "$HOME/.ssh/authorized_keys"
    fi

-    my_keytype=''
-    if test -f ~/.ssh/id_ed25519; then
-        my_keytype='ed25519'
-        if ! test -f ~/.ssh/id_ed25519.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub
-        fi
-    elif test -f ~/.ssh/id_rsa; then
-        my_keytype='rsa'
-        if ! test -f ~/.ssh/id_rsa.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
-        fi
-    elif test -f ~/.ssh/id_ecda; then
-        my_keytype='ecdsa'
-        if ! test -f ~/.ssh/id_ecdsa.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_ecda > ~/.ssh/id_ecda.pub
-        fi
-    else
-        my_keytype='rsa'
+    if [ ! -f "$HOME/.ssh/id_rsa" ]; then
+        ssh-keygen -b 2048 -t rsa -f "$HOME/.ssh/id_rsa" -q -N ""
+        echo >&2 ""
+    fi
+
+    if [ ! -f "$HOME/.ssh/id_rsa.pub" ]; then
+        ssh-keygen -y -f "$HOME/.ssh/id_rsa" > "$HOME/.ssh/id_rsa.pub"
        echo >&2 ""
-        echo >&2 "Generating public/private rsa key pair."
-        ssh-keygen -b 4096 -t rsa -f ~/.ssh/id_rsa -q -N ""
-        ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
    fi

    # TODO use the comment (if any) for the name of the file
    echo >&2 ""
    #shellcheck disable=SC2088
-    echo >&2 "~/Downloads/id_${my_keytype}.$(whoami).pub":
+    echo >&2 "~/Downloads/id_rsa.$(whoami).pub":
    echo >&2 ""
-    rm -f "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
-    cp -RPp "$HOME/.ssh/id_${my_keytype}.pub" "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
-    cat "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
+    rm -f "$HOME/Downloads/id_rsa.$(whoami).pub"
+    cp -r "$HOME/.ssh/id_rsa.pub" "$HOME/Downloads/id_rsa.$(whoami).pub"
+    cat "$HOME/Downloads/id_rsa.$(whoami).pub"
    echo >&2 ""
-
-    if test -f ~/.ssh/id_rsa; then
-        my_rsa_chars="$(cat ~/.ssh/id_rsa)"
-        if test "${#my_rsa_chars}" -lt 2500; then
-            fn_warn_rsa >&2
-            echo >&2 ""
-        fi
-    fi
 }

 main
--- a/vim-devicons/README.md
+++ b/vim-devicons/README.md
@@ -1,6 +1,6 @@
 ---
 title: vim-devicons
-homepage: https://github.com/ryanoasis/vim-devicons
+homepage: https://github.com/ryanoasis/devicons
 tagline: |
  VimDevIcons: Adds Icons to Your Plugins.
 ---
--- a/vim-things.sh
+++ b/vim-things.sh
@@ -0,0 +1,12 @@
+vim README.md
+vim _webi/template.ps1
+vim _webi/template.sh
+vim brew/install.sh
+vim git/install.ps1
+vim golang/install.ps1
+vim golang/install.sh
+vim node/install.ps1
+vim postgres/install.sh
+vim sass/install.ps1
+vim webi/install.sh
+vim zig/install.ps1
--- a/webi-essentials/install.sh
+++ b/webi-essentials/install.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 set -u
+#set -x

 fn_install_webi_essentials_macos() { (
    # streamline the output to be pretty
@@ -180,7 +181,7 @@ _install_webi_essentials() { (
        fi
    fi

-    printf '%s' "    $(t_dim 'Checking for apt/apk/pkg_add ...')"
+    printf '%s' "    $(t_dim 'Checking for apt/apk ...')"
    if command -v apt > /dev/null; then
        echo " $(t_pkg 'apt')"
        _install_webi_essentials_apt "${cmd_sudo}" "${b_pkgs}"
@@ -195,13 +196,6 @@ _install_webi_essentials() { (
        return 0
    fi

-    if command -v pkg_add > /dev/null; then
-        echo " $(t_pkg 'pkg_add')"
-        _install_webi_essentials_pkg_add "${cmd_sudo}" "${b_pkgs}"
-        echo "    $(t_dim 'OK')"
-        return 0
-    fi
-
    echo " $(t_dim 'none')"
    _install_webi_essentials_webi "${cmd_sudo}" "${b_pkgs}"
    echo "    $(t_dim 'OK')"
@@ -237,21 +231,11 @@ _install_webi_essentials_apk() { (
    ${cmd_sudo} apk add --no-cache ${b_pkgs}
 ); }

-_install_webi_essentials_pkg_add() { (
-    cmd_sudo="${1}"
-    b_pkgs="${2}"
-
-    echo "    $(t_dim 'Running') $(t_cmd "${cmd_sudo}pkg_add")"
-    fn_polite_sudo "${cmd_sudo}" "    $(t_cmd "pkg_add ${b_pkgs}")"
-    # shellcheck disable=SC2086
-    ${cmd_sudo} pkg_add ${b_pkgs}
-); }
-
 _install_webi_essentials_webi() { (
    cmd_sudo="${1}"
    b_pkgs="${2}"

-    if test "${b_pkgs}" = 'xz'; then
+    if test "${b_pkgs}" == 'xz'; then
        ~/.local/bin/webi xz
        return 0
    fi
--- a/webi/webi-pwsh.ps1
+++ b/webi/webi-pwsh.ps1
@@ -133,7 +133,7 @@ Push-Location $Env:USERPROFILE
 New-Item -Path "$HOME\.local\bin\" -ItemType Directory -Force | Out-Null

 # See note on Set-ExecutionPolicy above
-Set-Content -Path "$HOME\.local\bin\webi.bat" -Value "@echo off`r`npowershell -ExecutionPolicy Bypass -File `"%USERPROFILE%\.local\bin\webi-pwsh.ps1`" %*"
+Set-Content -Path "$HOME\.local\bin\webi.bat" -Value "@echo off`r`npowershell -ExecutionPolicy Bypass %USERPROFILE%\.local\bin\webi-pwsh.ps1 %*"
 # Backwards-compat bugfix: remove old webi-pwsh.ps1 location
 Remove-Item -Path "$HOME\.local\bin\webi.ps1" -Recurse -ErrorAction Ignore
 if (!(Test-Path -Path "$HOME\.local\opt")) {
@@ -199,7 +199,7 @@ $UrlParams = "formats=zip,exe,tar,git&libc=msvc"
 $PkgInstallPwsh = "$HOME\.local\tmp\$exename.install.ps1"
 Invoke-DownloadUrl -Force -URL $PKG_URL -Params $UrlParams -Path $PkgInstallPwsh

-powershell -File "$HOME\.local\tmp\${exename}.install.ps1"
+powershell $HOME\.local\tmp\${exename}.install.ps1

 IF ($IsWebiParent) {
    Write-Host ""
--- a/webi/webi.sh
+++ b/webi/webi.sh
@@ -63,11 +63,10 @@ __webi_main() {
    export WEBI_URL
    set -e

-    my_uname_o="$(uname -o 2> /dev/null || echo '')"
    my_libc=''
    if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
        my_libc='musl'
-    elif echo "${my_uname_o}" | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
        my_libc='gnu'
    else
        my_libc='libc'
@@ -142,30 +141,16 @@ __webi_main() {
    }

    fn_checksum() {
-        a_filepath="${1}"
-
-        if command -v sha1sum > /dev/null; then
-            sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-            return 0
-        fi
-
+        cmd_shasum='sha1sum'
        if command -v shasum > /dev/null; then
-            shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-            return 0
+            cmd_shasum='shasum'
        fi
-
-        if command -v sha1 > /dev/null; then
-            sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-            return 0
-        fi
-
-        echo >&2 "    warn: no sha1 sum program"
-        date '+%F %H:%M'
+        $cmd_shasum "${0}" | cut -d' ' -f1 | cut -c 1-8
    }

    version() {
        my_checksum="$(
-            fn_checksum "${0}"
+            fn_checksum
        )"
        my_version=v1.2.8
        printf "\e[35mwebi\e[32m %s\e[0m Copyright 2020+ AJ ONeal\n" "${my_version} (${my_checksum})"
--- a/1
+++ b/1
@@ -1 +0,0 @@
-commandlinetools
Author	SHA1	Message	Date
AJ ONeal	722df7641d	WIP: ref(installer): use new names for template vars	2023-12-30 23:40:14 -07:00
AJ ONeal	6e3eb1d9ad	fix(webi): remove bogus ./webi/releases.js	2023-12-30 23:38:41 -07:00
AJ ONeal	d01ce48f47	chore(ci): add git submodule	2023-12-30 23:38:40 -07:00
AJ ONeal	57fe6648c4	fix(installer): return rather than error for self-hosted installers (no releases.js)	2023-12-30 23:38:40 -07:00
AJ ONeal	0516aec7b2	chore(installer): remove duplicate check of targetRelease.packages	2023-12-30 23:38:36 -07:00
AJ ONeal	3df90b70b0	fix(installer): handle non-existant installers as 404	2023-12-30 23:38:35 -07:00
AJ ONeal	ca183af847	fix(classifier): name => projInfo.name	2023-12-30 23:38:35 -07:00
AJ ONeal	f9b6719a2d	feat(webi): show latest project release version on error	2023-12-30 23:38:35 -07:00
AJ ONeal	8522dea6a5	ref(webi): show supported OSes, etc with space rather than comma	2023-12-30 23:38:35 -07:00
AJ ONeal	f414fa78aa	feat(installer): replace getReleases with new builds classifier	2023-12-30 23:38:26 -07:00
AJ ONeal	9d3675396c	ref(classify): parallelize release downloads to fetch much faster	2023-12-30 23:38:26 -07:00
AJ ONeal	d3fee8f00d	feat: add builds classifier, and lint all builds	2023-12-30 23:38:26 -07:00
AJ ONeal	65c365c24a	feat: add build-classifier submodule	2023-12-30 23:38:26 -07:00
AJ ONeal	e9f46c355e	chore: add package.json.scripts.bump	2023-12-30 23:38:26 -07:00