WIP: ref!(webi): cleanup for later

.github/workflows/node.js.yml

@@ -23,15 +23,10 @@ jobs:
           sh ./_scripts/install-ci-deps
           echo "${HOME}/.local/bin" >> $GITHUB_PATH
           echo "${HOME}/.local/opt/pwsh" >> $GITHUB_PATH
-      - run: |
-          git submodule init
-          git submodule update
       - run: shfmt --version
       - run: shellcheck -V
       - run: node --version
       - run: npm run fmt
       - run: npm ci
       - run: npm run lint
-      - env:
+      - run: npm run test
-          GITHUB_TOKEN: ${{ github.token }}
-        run: npm run test

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "_webi/build-classifier"]
-	path = _webi/build-classifier
-	url = https://github.com/webinstall/webi-build-classifier.git

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
+git clone git@github.com:webinstall/packages.git
-pushd ./webi-installers/
+pushd packages
-git submodule update --init
+npm install
-npm clean-install
 ```
 
 ```sh

_common/git-tag.js

@@ -6,12 +6,11 @@ var Crypto = require('crypto');
 var util = require('util');
 var exec = util.promisify(require('child_process').exec);
 var Fs = require('node:fs/promises');
-var FsSync = require('node:fs');
 var Path = require('node:path');
 
 var repoBaseDir = process.env.REPO_BASE_DIR || '';
 if (!repoBaseDir) {
-  repoBaseDir = Path.resolve('./_repos');
+  repoBaseDir = Path.resolve('./repos');
   // for stderr
   console.error(`[Warn] REPO_BASE_DIR= not set, ${repoBaseDir}`);
 }
@@ -21,29 +20,8 @@ var Repos = {};
 Repos.clone = async function (repoPath, gitUrl) {
   let uuid = Crypto.randomUUID();
   let tmpPath = `${repoPath}.${uuid}.tmp`;
-  let bakPath = `${repoPath}.${uuid}.dup`;
   await exec(`git clone --bare --filter=tree:0 ${gitUrl} ${tmpPath}`);
-
+  await Fs.rename(tmpPath, repoPath);
-  try {
-    FsSync.accessSync(repoPath);
-    return;
-  } catch (e) {
-    if (e.code !== 'ENOENT') {
-      throw e;
-    }
-  }
-
-  // sync to avoid race conditions
-  try {
-    FsSync.renameSync(repoPath, bakPath);
-  } catch (e) {
-    if (e.code !== 'ENOENT') {
-      throw e;
-    }
-  }
-  FsSync.renameSync(tmpPath, repoPath);
-
-  await Fs.rm(bakPath, { force: true, recursive: true });
 };
 
 Repos.checkExists = async function (repoPath) {

_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 request
- * @param {String} owner
+ * @param {string} owner
- * @param {String} repo
+ * @param {string} repo
- * @param {String} baseurl
+ * @returns {PromiseLike<any> | Promise<any>}
- * @param {String} [username]
- * @param {String} [token]
  */
-async function getAllReleases(
+function getAllReleases(request, owner, repo, baseurl) {
-  _request,
+  if (!baseurl) {
-  owner,
+    return Promise.reject('missing baseurl');
-  repo,
+  }
-  baseurl,
+  return ghRelease(request, owner, repo, baseurl + '/api/v1').then(
-  username = '',
+    function (all) {
-  token = '',
+      return all;
-) {
+    },
-  baseurl = `${baseurl}/api/v1`;
+  );
-  let all = await GitHubish.getAllReleases({
-    owner,
-    repo,
-    baseurl,
-    username,
-    token,
-  });
-  return all;
 }
 
 module.exports = getAllReleases;
 
 if (module === require.main) {
   getAllReleases(
-    null,
+    require('@root/request'),
-    'root',
+    'coolaj86',
-    'pathman',
+    'go-pathman',
-    'https://git.rootprojects.org',
+    'https://git.coolaj86.com',
-    '',
-    '',
   ).then(
     //getAllReleases(require('@root/request'), 'root', 'serviceman', 'https://git.rootprojects.org').then(
     function (all) {

_common/github.js

@@ -1,41 +1,102 @@
 'use strict';
 
-require('dotenv').config({ path: '.env' });
+require('dotenv').config();
-
-let GitHubish = require('./githubish.js');
 
 /**
  * Lists GitHub Releases (w/ uploaded assets)
  *
- * @param {any} _request - deprecated
+ * @param request
- * @param {String} owner
+ * @param {string} owner
- * @param {String} repo
+ * @param {string} repo
- * @param {String} [baseurl]
+ * @returns {PromiseLike<any> | Promise<any>}
- * @param {String} [username]
- * @param {String} [token]
  */
 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({
+  if (!owner) {
-    owner,
+    throw new Error('missing owner for repo');
-    repo,
+  }
-    baseurl,
+  if (!repo) {
-    username,
+    throw new Error('missing repo name');
-    token,
+  }
-  });
+
+  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) {
+  getAllReleases(require('@root/request'), 'BurntSushi', 'ripgrep').then(
-    console.info(JSON.stringify(all, null, 2));
+    function (all) {
-  });
+      console.info(JSON.stringify(all, null, 2));
+    },
+  );
 }

_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));
-  });
-}

_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);
-  });

_webi/builds-cacher.js

@@ -1,969 +0,0 @@
-'use strict';
-
-var BuildsCacher = module.exports;
-
-let Fs = require('node:fs/promises');
-let Path = require('node:path');
-
-let HostTargets = require('./build-classifier/host-targets.js');
-let Lexver = require('./build-classifier/lexver.js');
-let Triplet = require('./build-classifier/triplet.js');
-
-let request = require('@root/request');
-
-var ALIAS_RE = /^alias: (\w+)$/m;
-
-var LEGACY_ARCH_MAP = {
-  '*': 'ANYARCH',
-  arm64: 'aarch64',
-  armv6l: 'armv6',
-  armv7l: 'armv7',
-  amd64: 'x86_64',
-  mipsle: 'mipsel',
-  mips64le: 'mips64el',
-  mipsr6le: 'mipsr6el',
-  mips64r6le: 'mips64r6el',
-  // yes... el for arm and mips, but le for ppc
-  // (perhaps the joke got old?)
-  ppc64el: 'ppc64le',
-  386: 'x86',
-};
-var LEGACY_OS_MAP = {
-  '*': 'ANYOS',
-  macos: 'darwin',
-  posix: 'posix_2017',
-};
-
-var TERMS_META = [
-  // pattern
-  '{ARCH}',
-  '{EXT}',
-  '{LIBC}',
-  '{NAME}',
-  '{OS}',
-  '{VENDOR}',
-  // // os-/arch-indepedent
-  // 'ANYARCH',
-  // 'ANYOS',
-  // // libc
-  // 'none',
-  // channel
-  'beta',
-  'dev',
-  'preview',
-  '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) {
-    if (err.code !== 'ENOENT') {
-      console.warn(`warn: ${path}: ${err.message}`);
-    }
-    return null;
-  });
-
-  return head;
-}
-
-// let fsOpen = util.promisify(Fs.open);
-// let fsRead = util.promisify(Fs.read);
-async function readFirstBytes(path) {
-  let start = 0;
-  let n = 1024;
-  let fh = await Fs.open(path, 'r');
-  let buf = Buffer.alloc(n);
-  let result = await fh.read(buf, start, n);
-  let str = result.buffer.toString('utf8');
-  await fh.close();
-
-  return str;
-}
-
-let promises = {};
-async function getLatestBuilds(Releases, installersDir, cacheDir, name, date) {
-  console.info(`[INFO] getLatestBuilds: ${name}`);
-
-  if (!Releases) {
-    Releases = require(`${installersDir}/${name}/releases.js`);
-  }
-  // TODO update all releases files with module.exports.xxxx = 'foo';
-  if (!Releases.latest) {
-    Releases.latest = Releases;
-  }
-
-  let id = `${cacheDir}/${name}`;
-  if (!promises[id]) {
-    promises[id] = Promise.resolve();
-  }
-
-  promises[id] = promises[id].then(async function () {
-    return await getLatestBuildsInner(Releases, cacheDir, name, date);
-  });
-
-  return await promises[id];
-}
-
-async function getLatestBuildsInner(Releases, cacheDir, name, date) {
-  let data = await Releases.latest(request);
-
-  if (!date) {
-    date = new Date();
-  }
-  let isoDate = date.toISOString();
-  let yearMonth = isoDate.slice(0, 7);
-
-  // TODO hash file
-  let dataFile = `${cacheDir}/${yearMonth}/${name}.json`;
-  // TODO fsstat releases.js vs require-ing time as well
-  let tsFile = `${cacheDir}/${yearMonth}/${name}.updated.txt`;
-
-  let dirPath = Path.dirname(dataFile);
-  await Fs.mkdir(dirPath, { recursive: true });
-
-  let json = JSON.stringify(data, null, 2);
-  await Fs.writeFile(dataFile, json, 'utf8');
-
-  let seconds = date.valueOf();
-  let ms = seconds / 1000;
-  let msStr = ms.toFixed(3);
-  await Fs.writeFile(tsFile, msStr, 'utf8');
-
-  return data;
-}
-
-BuildsCacher.create = function ({ ALL_TERMS, installers, caches }) {
-  let installersDir = installers;
-  let cacheDir = caches;
-
-  if (!ALL_TERMS) {
-    ALL_TERMS = Triplet.TERMS_PRIMARY_MAP;
-  }
-
-  let bc = {};
-  bc.usedTerms = {};
-  bc.orphanTerms = Object.assign({}, ALL_TERMS);
-  bc.unknownTerms = {};
-  bc.formats = [];
-  bc._triplets = {};
-  bc._targetsByBuildIdCache = {};
-  bc._caches = {};
-  bc._staleAge = 15 * 60 * 1000;
-  bc._allFormats = {};
-  bc._allTriplets = {};
-
-  for (let term of TERMS_META) {
-    delete bc.orphanTerms[term];
-  }
-
-  bc.getProjectsByType = async function () {
-    let dirs = {
-      hidden: {},
-      errors: {},
-      alias: {},
-      invalid: {},
-      selfhosted: {},
-      valid: {},
-    };
-
-    let entries = await Fs.readdir(installersDir, { withFileTypes: true });
-    for (let entry of entries) {
-      let meta = await bc.getProjectTypeByEntry(entry);
-      if (meta.type === 'not_found') {
-        let err = meta.detail;
-        console.error('');
-        console.error('PROBLEM');
-        console.error(`    ${err.message}`);
-        console.error('');
-        console.error('SOLUTION');
-        console.error('    npm clean-install');
-        console.error('');
-        throw new Error(
-          '[SANITY FAIL] should never have missing modules in prod',
-        );
-      }
-      dirs[meta.type][entry.name] = meta.detail;
-    }
-
-    return dirs;
-  };
-
-  /**
-   * Get project type and detail - alias, selfhosted, valid (and the invalids)
-   * @param {String} name - filename
-   */
-  bc.getProjectType = async function (name) {
-    let filepath = Path.join(installersDir, name);
-    let entry;
-    try {
-      entry = await Fs.lstat(filepath);
-      Object.assign(entry, { name: name });
-    } catch (e) {
-      return { type: 'errors', detail: 'not found' };
-    }
-    let info = await bc.getProjectTypeByEntry(entry);
-
-    return info;
-  };
-
-  /**
-   * Get project type and detail - alias, selfhosted, valid (and the invalids)
-   * @param {fs.Stats|fs.Dirent} entry
-   */
-  bc.getProjectTypeByEntry = async function (entry) {
-    let path = Path.join(installersDir, entry.name);
-
-    // skip non-installer dirs
-    if (entry.isSymbolicLink()) {
-      let link = await Fs.readlink(path);
-      return { type: 'alias', detail: link };
-    }
-
-    if (!entry.isDirectory()) {
-      return { type: 'hidden', detail: '!directory' };
-    }
-    if (entry.name === 'node_modules') {
-      return { type: 'hidden', detail: 'node_modules' };
-    }
-    if (entry.name.startsWith('_')) {
-      return { type: 'hidden', detail: '_*' };
-    }
-    if (entry.name.startsWith('.')) {
-      return { type: 'hidden', detail: '.*' };
-    }
-    if (entry.name.startsWith('~')) {
-      return { type: 'hidden', detail: '~*' };
-    }
-    if (entry.name.endsWith('~')) {
-      return { type: 'hidden', detail: '*~' };
-    }
-
-    // skip invalid installers
-    let head = await getPartialHeader(path);
-    if (!head) {
-      return { type: 'invalid', detail: '!README.md' };
-    }
-
-    let alias = head.match(ALIAS_RE);
-    if (alias) {
-      let link = alias[1];
-      return { type: 'alias', detail: link };
-    }
-
-    let releasesPath = Path.join(path, 'releases.js');
-    try {
-      void require(releasesPath);
-    } catch (err) {
-      if (err.code !== 'MODULE_NOT_FOUND') {
-        return { type: 'errors', detail: err };
-      }
-
-      if (err.message.includes(`Cannot find module '${releasesPath}'`)) {
-        return { type: 'selfhosted', detail: true };
-      }
-
-      return { type: 'not_found', detail: err };
-    }
-
-    return { type: 'valid', detail: true };
-  };
-
-  // Typically a package is organized by release (ex: go has 1.20, 1.21, etc),
-  // but we will organize by the build (ex: go1.20-darwin-arm64.tar.gz, etc).
-  bc.getPackages = async function ({ Releases, name, date }) {
-    if (!date) {
-      date = new Date();
-    }
-    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 projInfo = bc._caches[name];
-
-    let meta = {
-      // version info
-      versions: projInfo?.versions || [],
-      lexvers: projInfo?.lexvers || [],
-      lexversMap: projInfo?.lexversMap || {},
-      // culled release assets
-      packages: projInfo?.packages || [],
-      releasesByTriplet: projInfo?.releasesByTriplet || {},
-      // target info
-      triplets: projInfo?.triplets || [],
-      oses: projInfo?.oses || [],
-      arches: projInfo?.arches || [],
-      libcs: projInfo?.libcs || [],
-      formats: projInfo?.formats || [],
-      // TODO channels: projInfo?.channels || [],
-    };
-
-    if (!projInfo) {
-      let json = await Fs.readFile(dataFile, 'ascii').catch(
-        async function (err) {
-          if (err.code !== 'ENOENT') {
-            throw err;
-          }
-
-          return null;
-        },
-      );
-
-      try {
-        projInfo = JSON.parse(json);
-      } catch (e) {
-        console.error(`error: ${dataFile}:\n\t${e.message}`);
-        projInfo = null;
-      }
-    }
-    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) {
-        return;
-      }
-
-      projInfo = await getLatestBuilds(Releases, installersDir, cacheDir, name);
-      transformAndUpdate(name, projInfo, meta, date);
-    });
-
-    return projInfo;
-  };
-
-  function transformAndUpdate(name, projInfo, meta, date) {
-    meta.packages = [];
-
-    let updated = date.valueOf();
-
-    Object.assign(projInfo, { name, updated }, meta);
-    for (let build of projInfo.releases) {
-      let buildTarget = bc.classify(projInfo, build);
-      if (!buildTarget) {
-        // ignore known, non-package extensions
-        continue;
-      }
-
-      if (buildTarget.error) {
-        let err = buildTarget.error;
-        let code = err.code || '';
-        console.error(`[ERROR]: ${code} ${projInfo.name}: ${build.name}`);
-        console.error(`>>> ${err.message} <<<`);
-        console.error(projInfo);
-        console.error(build);
-        console.error(`^^^ ${err.message} ^^^`);
-        console.error(err.stack);
-        continue;
-      }
-
-      if (!build.name) {
-        build.name = build.download.replace(/.*\//, '');
-      }
-
-      build.target = buildTarget;
-      meta.packages.push(build);
-    }
-
-    updateReleasesByTriplet(meta);
-    updateAndSortVersions(projInfo, meta);
-
-    Object.assign(projInfo, { name, updated }, meta);
-    bc._caches[name] = projInfo;
-  }
-
-  function updateReleasesByTriplet(meta) {
-    for (let build of meta.packages) {
-      let target = build.target;
-
-      let triplet = `${target.os}-${target.arch}-${target.libc}`;
-      if (!meta.releasesByTriplet[triplet]) {
-        meta.releasesByTriplet[triplet] = {};
-      }
-
-      let buildsByRelease = meta.releasesByTriplet[triplet];
-      if (!buildsByRelease[build.version]) {
-        buildsByRelease[build.version] = [];
-      }
-
-      let packages = buildsByRelease[build.version];
-      packages.push(build);
-    }
-  }
-
-  // TODO
-  //   - tag channels
-  function updateAndSortVersions(projInfo, meta) {
-    for (let build of projInfo.packages) {
-      let hasVersion = meta.versions.includes(build.version);
-      if (!hasVersion) {
-        build.lexver = Lexver.parseVersion(build.version);
-        meta.lexversMap[build.lexver] = build.version;
-      }
-    }
-
-    meta.lexvers = Object.keys(meta.lexversMap);
-    meta.lexvers.sort();
-    meta.lexvers.reverse();
-
-    meta.versions = [];
-    for (let lexver of meta.lexvers) {
-      let version = meta.lexversMap[lexver];
-      meta.versions.push(version);
-    }
-
-    projInfo.packages.sort(function (a, b) {
-      if (a.lexver > b.lexver) {
-        return -1;
-      }
-      if (a.lexver < b.lexver) {
-        return 1;
-      }
-      return 0;
-    });
-  }
-
-  // Makes sure that packages are updated once an hour, on average
-  bc._staleNames = [];
-  bc._freshenTimeout = null;
-  bc.freshenRandomPackage = async function (minDelay) {
-    if (!minDelay) {
-      minDelay = 15 * 1000;
-    }
-
-    if (bc._staleNames.length === 0) {
-      let dirs = await bc.getProjectsByType();
-      bc._staleNames = Object.keys(dirs.valid);
-      bc._staleNames.sort(function () {
-        return 0.5 - Math.random();
-      });
-    }
-
-    let name = bc._staleNames.pop();
-    void (await bc.getPackages({
-      //Releases: Releases,
-      name: name,
-      date: new Date(),
-    }));
-    console.info(`[INFO] freshenRandomPackage: ${name}`);
-
-    let hour = 60 * 60 * 1000;
-    let delay = minDelay;
-    let spread = hour / bc._staleNames.length;
-    let seed = Math.random();
-    delay += seed * spread;
-
-    clearTimeout(bc._freshenTimeout);
-    bc._freshenTimeout = setTimeout(bc.freshenRandomPackage, delay);
-    bc._freshenTimeout.unref();
-  };
-
-  bc.classify = function (projInfo, build) {
-    /* jshint maxcomplexity: 25 */
-    let maybeInstallable = Triplet.maybeInstallable(projInfo, build);
-    if (!maybeInstallable) {
-      return null;
-    }
-
-    if (LEGACY_OS_MAP[build.os]) {
-      build.os = LEGACY_OS_MAP[build.os];
-    }
-    if (LEGACY_ARCH_MAP[build.arch]) {
-      build.arch = LEGACY_ARCH_MAP[build.arch];
-    }
-
-    // because some packages are shimmed to match a single download against
-    let preTarget = Object.assign({ os: '', arch: '', libc: '' }, build);
-
-    let targetId = `${preTarget.os}:${preTarget.arch}:${preTarget.libc}`;
-    let buildId = `${projInfo.name}:${targetId}@${build.download}`;
-    let target = bc._targetsByBuildIdCache[buildId];
-    if (target) {
-      Object.assign(build, { target: target, triplet: target.triplet });
-      return target;
-    }
-
-    let pattern = Triplet.toPattern(projInfo, build);
-    if (!pattern) {
-      let err = new Error(`no pattern generated for ${projInfo.name}`);
-      err.code = 'E_BUILD_NO_PATTERN';
-      target = { error: err };
-      bc._targetsByBuildIdCache[buildId] = target;
-      return target;
-    }
-
-    let rawTerms = pattern.split(/[_\{\}\/\.\-]+/g);
-    for (let term of rawTerms) {
-      delete bc.orphanTerms[term];
-      bc.usedTerms[term] = true;
-    }
-
-    // {NAME}/{NAME}-{VER}-Windows-x86_64_v2-musl.exe =>
-    //     {NAME}.windows.x86_64v2.musl.exe
-    let terms = Triplet.patternToTerms(pattern);
-    if (!terms.length) {
-      let err = new Error(`'${terms}' was trimmed to ''`);
-      target = { error: err };
-      bc._targetsByBuildIdCache[buildId] = target;
-      return target;
-    }
-
-    for (let term of terms) {
-      if (!term) {
-        continue;
-      }
-
-      if (ALL_TERMS[term]) {
-        delete bc.orphanTerms[term];
-        bc.usedTerms[term] = true;
-        continue;
-      }
-
-      bc.unknownTerms[term] = true;
-    }
-
-    // {NAME}.windows.x86_64v2.musl.exe
-    //     windows-x86_64_v2-musl
-    target = { triplet: '' };
-    void Triplet.termsToTarget(target, projInfo, build, terms);
-
-    target.triplet = `${target.arch}-${target.vendor}-${target.os}-${target.libc}`;
-
-    {
-      // TODO I don't love this hidden behavior
-      // perhaps classify should just happen when the package is loaded
-      // (and the sanity error should be removed, or thrown after the loop is complete)
-      let hasTriplet = projInfo.triplets.includes(target.triplet);
-      if (!hasTriplet) {
-        projInfo.triplets.push(target.triplet);
-      }
-      let hasOs = projInfo.oses.includes(target.os);
-      if (!hasOs) {
-        projInfo.oses.push(target.os);
-      }
-      let hasArch = projInfo.arches.includes(target.arch);
-      if (!hasArch) {
-        projInfo.arches.push(target.arch);
-      }
-      let hasLibc = projInfo.libcs.includes(target.libc);
-      if (!hasLibc) {
-        projInfo.libcs.push(target.libc);
-      }
-
-      if (!build.ext) {
-        build.ext = Triplet.buildToPackageType(build);
-      }
-      if (build.ext) {
-        if (!build.ext.startsWith('.')) {
-          build.ext = `.${build.ext}`;
-        }
-      }
-      let hasExt = projInfo.formats.includes(build.ext);
-      if (!hasExt) {
-        projInfo.formats.push(build.ext);
-      }
-      let hasGlobalExt = bc.formats.includes(build.ext);
-      if (!hasGlobalExt) {
-        bc.formats.push(build.ext);
-      }
-    }
-
-    bc._triplets[target.triplet] = true;
-    bc._targetsByBuildIdCache[buildId] = target;
-
-    let triple = [target.arch, target.vendor, target.os, target.libc];
-    for (let term of triple) {
-      if (!ALL_TERMS[term]) {
-        throw new Error(
-          `[SANITY FAIL] '${projInfo.name}' '${target.triplet}' generated unknown term '${term}'`,
-        );
-      }
-
-      delete bc.orphanTerms[term];
-      bc.usedTerms[term] = true;
-    }
-
-    return target;
-  };
-
-  /**
-   * Given a list of acceptable formats, get the sorted list of of formats.
-   * Actually used (as per node _webi/lint-builds.js):
-   *     .7z
-   *     .app.zip
-   *     .dmg
-   *     .exe
-   *     .exe.xz
-   *     .git
-   *     .gz
-   *     .msi
-   *     .pkg
-   *     .pkg.tar.zst
-   *     .sh
-   *     .tar.gz
-   *     .tar.xz
-   *     .xz
-   *     .zip
-   */
-  bc.getSortedFormats = function (formats) {
-    /* jshint maxcomplexity: 25 */
-    formats.sort();
-    let id = formats.join(',');
-    if (bc._allFormats[id]) {
-      return bc._allFormats[id];
-    }
-
-    // we don't know how to handle any of these yet
-    // let exclude = [];
-    // let isAndroid = false;
-    // if (!isAndroid) {
-    //   exclude.push('.apk');
-    // }
-    // let isDebian = false;
-    // if (!isDebian) {
-    //   exclude.push('.deb');
-    // }
-    // let isEnterpriseLinux = false;
-    // if (!isEnterpriseLinux) {
-    //   exclude.push('.rpm');
-    // }
-    // let isArch = false;
-    // if (!isArch) {
-    //   exclude.push('.pkg.tar.zst');
-    // }
-
-    let hasExe = formats.includes('exe') || formats.includes('.exe');
-
-    /** @type {Array<String>} */
-    let exts = [];
-
-    let hasXz = formats.includes('xz') || formats.includes('.xz');
-    if (hasXz) {
-      exts.push('.tar.xz');
-      if (hasExe) {
-        exts.push('.exe.xz');
-      }
-      exts.push('.xz');
-    }
-    let hasZst = formats.includes('zst') || formats.includes('.zst');
-    if (hasZst) {
-      exts.push('.tar.zst');
-      exts.push('.zst');
-    }
-    let hasZip = formats.includes('zip') || formats.includes('.zip');
-    if (hasZip) {
-      exts.push('.zip');
-    }
-    let has7z = false;
-    if (has7z) {
-      exts.push('.7z');
-    }
-    // let hasBz2 = formats.includes('bz2') || formats.includes('.bz2');
-    // if (hasBz2) {
-    // 	exts.push('.bz2');
-    // }
-    if (hasExe) {
-      if (!hasZip) {
-        exts.push('.zip');
-      }
-      exts.push('.tar.gz');
-      exts.push('.gz');
-      exts.push('.exe');
-      exts.push('.msi');
-      //exts.push('.msixbundle');
-    } else {
-      exts.push('.tar.gz');
-      exts.push('.gz');
-      exts.push('.sh');
-    }
-    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');
-    if (!hasXz) {
-      exts.push('.tar.xz');
-      if (hasExe) {
-        exts.push('.exe.xz');
-      }
-      exts.push('.xz');
-    }
-    if (!hasZip) {
-      if (!hasExe) {
-        exts.push('.zip');
-      }
-    }
-    if (!hasZst) {
-      exts.push('.tar.zst');
-      exts.push('.zst');
-    }
-    if (!has7z) {
-      exts.push('.7z');
-    }
-    // if (!hasRar) {
-    // 	exts.push('.rar');
-    // }
-    // exts.push('.tar.bz2');
-    // exts.push('.bz2');
-
-    bc._allFormats[id] = exts;
-    return exts;
-  };
-
-  bc.selectPackage = function (packages, formats) {
-    if (packages.length === 1) {
-      return packages[0];
-    }
-
-    let exts = bc.getSortedFormats(formats);
-    for (let ext of exts) {
-      for (let build of packages) {
-        if (build.ext === ext) {
-          return build;
-        }
-      }
-    }
-
-    return packages[0];
-  };
-
-  /**
-   * @param {ProjectInfo} projInfo
-   * @param {HostTarget} hostTarget
-   */
-  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);
-    let triplets = bc._enumerateTriplets(hostTarget);
-    //console.log('dbg: matchInfo', matchInfo);
-
-    if (matchInfo) {
-      for (let _triplet of triplets) {
-        let targetReleases = projInfo.releasesByTriplet[_triplet];
-        if (!targetReleases) {
-          continue;
-        }
-
-        // 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 packages = targetReleases[ver];
-          if (!packages) {
-            continue;
-          }
-
-          let match = {
-            triplet: _triplet,
-            packages: packages,
-            latest: projInfo.versions[0],
-            version: ver,
-            versions: matchInfo,
-          };
-          return match;
-        }
-      }
-
-      return null;
-    }
-
-    for (let _triplet of triplets) {
-      let targetReleases = projInfo.releasesByTriplet[_triplet];
-      if (!targetReleases) {
-        continue;
-      }
-
-      let versions = Object.keys(targetReleases);
-      //console.log('dbg: targetRelease versions', versions);
-      let lexvers = [];
-      for (let version of versions) {
-        let lexPrefix = Lexver.parseVersion(version);
-        lexvers.push(lexPrefix);
-      }
-      lexvers.sort();
-      lexvers.reverse();
-      // TODO get the other matchInfo props
-
-      // 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 packages = targetReleases[ver];
-        //console.log('dbg: packages', packages);
-        if (!packages) {
-          continue;
-        }
-
-        let pkg = packages[0];
-        if (verTarget.lts) {
-          if (!pkg.lts) {
-            continue;
-          }
-
-          let match = {
-            triplet: _triplet,
-            packages: packages,
-            latest: projInfo.versions[0],
-            version: ver,
-            versions: matchInfo,
-          };
-          return match;
-        }
-
-        let wantChannel = verTarget.channel || 'stable';
-        let isChannel = pkg.channel || 'stable';
-        if (wantChannel === 'stable') {
-          if (isChannel !== 'stable') {
-            continue;
-          }
-        }
-        // latest, beta, alpha, rc, preview
-
-        let match = {
-          triplet: _triplet,
-          packages: packages,
-          latest: projInfo.versions[0],
-          version: ver,
-          versions: matchInfo,
-        };
-        return match;
-      }
-    }
-
-    return null;
-  };
-
-  bc._enumerateTriplets = function (hostTarget) {
-    let id = [hostTarget.os, hostTarget.arch, hostTarget.libc].join(',');
-    let triplets = bc._allTriplets[id] || [];
-    if (triplets.length > 0) {
-      return triplets;
-    }
-
-    let oses = [];
-    if (hostTarget.os === 'windows') {
-      oses = ['ANYOS', 'windows'];
-    } else if (hostTarget.os === 'android') {
-      oses = ['ANYOS', 'posix_2017', 'android', 'linux'];
-    } else {
-      oses = ['ANYOS', 'posix_2017', hostTarget.os];
-    }
-
-    let waterfall = HostTargets.WATERFALL[hostTarget.os] || {};
-    let arches = waterfall[hostTarget.arch] ||
-      HostTargets.WATERFALL.ANYOS[hostTarget.arch] || [hostTarget.arch];
-    arches = ['ANYARCH'].concat(arches);
-    let libcs = waterfall[hostTarget.libc] ||
-      HostTargets.WATERFALL.ANYOS[hostTarget.libc] || [hostTarget.libc];
-
-    for (let os of oses) {
-      for (let arch of arches) {
-        for (let libc of libcs) {
-          let triplet = `${os}-${arch}-${libc}`;
-          triplets.push(triplet);
-        }
-      }
-    }
-    bc._allTriplets[id] = triplets;
-
-    return triplets;
-  };
-
-  bc._enumerateVersions = function (projInfo, ver) {
-    if (!ver) {
-      return null;
-    }
-    let lexPrefix = Lexver.parsePrefix(ver);
-    let matchInfo = Lexver.matchSorted(projInfo.lexvers, lexPrefix);
-
-    return matchInfo;
-  };
-
-  return bc;
-};

_webi/builds.js

@@ -1,41 +0,0 @@
-'use strict';
-
-let Builds = module.exports;
-
-let Path = require('node:path');
-
-let BuildsCacher = require('./builds-cacher.js');
-// let HostTargets = require('./build-classifier/host-targets.js');
-let Parallel = require('./parallel.js');
-
-var INSTALLERS_DIR = Path.join(__dirname, '..');
-var CACHE_DIR = Path.join(__dirname, '../_cache');
-
-let bc = BuildsCacher.create({
-  caches: CACHE_DIR,
-  installers: INSTALLERS_DIR,
-});
-bc.freshenRandomPackage(600 * 1000);
-
-Builds.init = async function () {
-  bc.freshenRandomPackage(600 * 1000);
-
-  let dirs = await bc.getProjectsByType();
-  let projNames = Object.keys(dirs.valid);
-
-  let parallel = 25;
-  await Parallel.run(parallel, projNames, getAll);
-  async function getAll(name) {
-    void (await bc.getPackages({
-      //Releases: Releases,
-      name: name,
-      date: new Date(),
-    }));
-  }
-};
-
-Builds.enumerateLatestVersions = bc.enumerateLatestVersions;
-Builds.findMatchingPackages = bc.findMatchingPackages;
-Builds.getPackage = bc.getPackages;
-Builds.getProjectType = bc.getProjectType;
-Builds.selectPackage = bc.selectPackage;

_webi/curl-pipe-bootstrap.tpl.sh

@@ -16,45 +16,39 @@ export WEBI_CHECKSUM=06a7fb9f
 #                                       #
 #########################################
 
+# shellcheck disable=SC2005
 fn_show_welcome() { (
     echo ""
+    printf "%s %s\n" \
+        "$(t_strong 'Welcome to') $(t_stronger 'Webi')$(t_strong '!')" \
+        "$(t_dim "- Modern tools, instant installs.")"
+    echo "We expect your experience to be $(t_em 'absolutely perfect')!"
     echo ""
-    # invert t_task and t_pkg for top-level welcome message
+    echo "    $(t_yellow 'Have a problem?') Please $(t_em 'let us know'):"
-    printf -- ">>> %s %s  <<<\n" \
+    echo "        $(t_url 'https://github.com/webinstall/webi-installers/issues')"
-        "$(t_pkg 'Welcome to') $(t_task 'Webi')$(t_pkg '!')" \
+    echo "        $(t_dim "(your system is $(t_yellow "$(uname -s)")/$(t_yellow "$(uname -m)") with $(t_yellow "$(fn_get_libc)") & $(t_yellow "$(fn_get_http)"))")"
-        "$(t_dim "- modern tools, instant installs.")"
-    echo "    We expect your experience to be $(t_em 'absolutely perfect')!"
     echo ""
-    echo "    $(t_attn 'Success')? Star it!   $(t_url 'https://github.com/webinstall/webi-installers')"
+    echo "    $(t_yellow 'Love it?') Star it!"
-    echo "    $(t_attn 'Problem')? Report it: $(t_url 'https://github.com/webinstall/webi-installers/issues')"
+    echo "        $(t_url 'https://github.com/webinstall/webi-installers')"
-    echo "                        $(t_dim "(your system is") $(t_host "$(fn_get_os)")/$(t_host "$(uname -m)") $(t_dim "with") $(t_host "$(fn_get_libc)") $(t_dim "&") $(t_host "$(fn_get_http_client_name)")$(t_dim ")")"
 
     sleep 0.2
 ); }
 
-fn_get_os() { (
+t_strong() { (printf '\e[36m%s\e[39m' "${1}"); }
-    # Ex:
+t_stronger() { (printf '\e[1m\e[32m%s\e[39m\e[22m' "${1}"); }
-    #     GNU/Linux
+t_url() { (printf '\e[2m%s\e[22m' "${1}"); }
-    #     Android
+t_path() { (printf '\e[2m\e[32m%s\e[39m\e[22m' "${1}"); }
-    #     Linux (often Alpine, musl)
+t_cmd() { (printf '\e[2m\e[35m%s\e[39m\e[22m' "${1}"); }
-    #     Darwin
+t_err() { (printf '\e[31m%s\e[39m' "${1}"); }
-    b_os="$(uname -o 2> /dev/null || echo '')"
-    b_sys="$(uname -s)"
-    if test -z "${b_os}" || test "${b_os}" = "${b_sys}"; then
-        # ex: 'Darwin' (and plain, non-GNU 'Linux')
-        echo "${b_sys}"
-        return 0
-    fi
 
-    if echo "${b_os}" | grep -q "${b_sys}"; then
+t_bold() { (printf '\e[1m%s\e[22m' "${1}"); }
-        # ex: 'GNU/Linux'
+t_dim() { (printf '\e[2m%s\e[22m' "${1}"); }
-        echo "${b_os}"
+t_em() { (printf '\e[3m%s\e[23m' "${1}"); }
-        return 0
+t_under() { (printf '\e[4m%s\e[24m' "${1}"); }
-    fi
+t_green() { (printf '\e[32m%s\e[39m' "${1}"); }
-
+t_yellow() { (printf '\e[33m%s\e[39m' "${1}"); }
-    # ex: 'Android/Linux'
+t_magenta() { (printf '\e[35m%s\e[39m' "${1}"); }
-    echo "${b_os}/${b_sys}"
+t_cyan() { (printf '\e[36m%s\e[39m' "${1}"); }
-); }
 
 fn_get_libc() { (
     # Ex:
@@ -62,14 +56,14 @@ fn_get_libc() { (
     #     libc
     if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
         echo 'musl'
-    elif fn_get_os | grep -q 'GNU|Linux'; then
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
         echo 'gnu'
     else
         echo 'libc'
     fi
 ); }
 
-fn_get_http_client_name() { (
+fn_get_http() { (
     # Ex:
     #     curl
     #     curl+wget
@@ -88,56 +82,6 @@ fn_get_http_client_name() { (
     echo "${b_client}"
 ); }
 
-#########################################
-#                                       #
-#      For Making the Display Nice      #
-#                                       #
-#########################################
-
-# Term Types
-t_cmd() { (fn_printf '\e[2m\e[35m%s\e[39m\e[22m' "${1}"); }
-t_host() { (fn_printf '\e[2m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_link() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_path() { (fn_printf '\e[2m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_pkg() { (fn_printf '\e[1m\e[32m%s\e[39m\e[22m' "${1}"); }
-t_task() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_url() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-
-# Levels
-t_info() { (fn_printf '\e[1m\e[36m%s\e[39m\e[22m' "${1}"); }
-t_attn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_warn() { (fn_printf '\e[1m\e[33m%s\e[39m\e[22m' "${1}"); }
-t_err() { (fn_printf '\e[31m%s\e[39m' "${1}"); }
-
-# Styles
-t_bold() { (fn_printf '\e[1m%s\e[22m' "${1}"); }
-t_dim() { (fn_printf '\e[2m%s\e[22m' "${1}"); }
-t_em() { (fn_printf '\e[3m%s\e[23m' "${1}"); }
-t_under() { (fn_printf '\e[4m%s\e[24m' "${1}"); }
-
-# FG Colors
-t_cyan() { (fn_printf '\e[36m%s\e[39m' "${1}"); }
-t_green() { (fn_printf '\e[32m%s\e[39m' "${1}"); }
-t_magenta() { (fn_printf '\e[35m%s\e[39m' "${1}"); }
-t_yellow() { (fn_printf '\e[33m%s\e[39m' "${1}"); }
-
-fn_printf() { (
-    a_style="${1}"
-    a_text="${2}"
-    if fn_is_tty; then
-        #shellcheck disable=SC2059
-        printf -- "${a_style}" "${a_text}"
-    else
-        printf -- '%s' "${a_text}"
-    fi
-); }
-
-fn_sub_home() { (
-    my_rel=${HOME}
-    my_abs=${1}
-    echo "${my_abs}" | sed "s:^${my_rel}:~:"
-); }
-
 ###################################
 #                                 #
 #       Detect HTTP Client        #
@@ -150,14 +94,9 @@ fn_wget() { (
     a_url="${1}"
     a_path="${2}"
 
-    cmd_wget="wget -c -q --user-agent"
+    cmd_wget="wget -q --user-agent"
-    if fn_is_tty; then
+    if fn_is_interactive; then
-        cmd_wget="wget -c -q --show-progress --user-agent"
+        cmd_wget="wget -q --show-progress --user-agent"
-    fi
-    # busybox wget doesn't support --show-progress
-    # See <https://github.com/webinstall/webi-installers/pull/772>
-    if readlink "$(command -v wget)" | grep -q busybox; then
-        cmd_wget="wget --user-agent"
     fi
 
     b_triple_ua="$(fn_get_target_triple_user_agent)"
@@ -166,9 +105,9 @@ fn_wget() { (
         b_agent="webi/wget+curl ${b_triple_ua}"
     fi
 
-    if ! $cmd_wget "${b_agent}" "${a_url}" -O "${a_path}"; then
+    if ! $cmd_wget "${b_agent}" -c "${a_url}" -O "${a_path}"; then
         echo >&2 "    $(t_err "failed to download (wget)") '$(t_url "${a_url}")'"
-        echo >&2 "    $cmd_wget '${b_agent}' '${a_url}' -O '${a_path}'"
+        echo >&2 "    $cmd_wget '${b_agent}' -c '${a_url}' -O '${a_path}'"
         echo >&2 "    $(wget -V)"
         return 1
     fi
@@ -180,9 +119,9 @@ fn_curl() { (
     a_url="${1}"
     a_path="${2}"
 
-    cmd_curl="curl -f -sSL -#"
+    cmd_curl="curl --fail-with-body -sSL -#"
-    if fn_is_tty; then
+    if fn_is_interactive; then
-        cmd_curl="curl -f -sSL"
+        cmd_curl="curl --fail-with-body sSL"
     fi
 
     b_triple_ua="$(fn_get_target_triple_user_agent)"
@@ -199,11 +138,21 @@ fn_curl() { (
     fi
 ); }
 
+fn_is_interactive() {
+    # Ex:
+    #     himBH
+    #     hBc
+    case $- in
+        *i*) return 0 ;;
+        *) return 1 ;;
+    esac
+}
+
 fn_get_target_triple_user_agent() { (
     # Ex:
-    #     x86_64/unknown GNU/Linux/5.15.107-2-pve gnu
+    #     x86_64/unknown Linux/5.15.107-2-pve gnu
     #     arm64/unknown Darwin/22.6.0 libc
-    echo "$(uname -m)/unknown $(fn_get_os)/$(uname -r) $(fn_get_libc)"
+    echo "$(uname -m)/unknown $(uname -s)/$(uname -r) $(fn_get_libc)"
 ); }
 
 fn_download_to_path() { (
@@ -211,10 +160,10 @@ fn_download_to_path() { (
     a_path="${2}"
 
     mkdir -p "$(dirname "${a_path}")"
-    if command -v curl > /dev/null; then
+    if command -v wget > /dev/null; then
-        fn_curl "${a_url}" "${a_path}.part"
-    elif command -v wget > /dev/null; then
         fn_wget "${a_url}" "${a_path}.part"
+    elif command -v curl > /dev/null; then
+        fn_curl "${a_url}" "${a_path}.part"
     else
         echo >&2 "    $(t_err "failed to detect HTTP client (curl, wget)")"
         return 1
@@ -228,122 +177,67 @@ fn_download_to_path() { (
 #                                            #
 ##############################################
 
-webi_bootstrap() { (
+webi_upgrade() { (
     a_path="${1}"
 
     echo ""
-    echo "$(t_task 'Bootstrapping') $(t_pkg 'Webi')"
+    echo "$(t_strong 'Bootstrapping') $(t_stronger 'Webi')"
 
     b_path_rel="$(fn_sub_home "${a_path}")"
     b_checksum=""
     if test -r "${a_path}"; then
+        echo "    $(t_dim 'Found') $(t_path "${b_path_rel}")"
         b_checksum="$(fn_checksum "${a_path}")"
     fi
     if test "$b_checksum" = "${WEBI_CHECKSUM}"; then
-        echo "    $(t_dim 'Found') $(t_path "${b_path_rel}")"
         sleep 0.1
         return 0
     fi
 
     b_webi_file_url="${WEBI_HOST}/packages/webi/webi.sh"
-    b_tmp=''
     if test -r "${a_path}"; then
-        b_ts="$(date -u '+%s')"
-        b_tmp="${a_path}.${b_ts}.bak"
-        mv "${a_path}" "${b_tmp}"
         echo "    Updating $(t_path "${b_path_rel}")"
     fi
-
     echo "    Downloading $(t_url "${b_webi_file_url}")"
     echo "        to $(t_path "${b_path_rel}")"
     fn_download_to_path "${b_webi_file_url}" "${a_path}"
     chmod u+x "${a_path}"
-
-    if test -r "${b_tmp}"; then
-        rm -f "${b_tmp}"
-    fi
 ); }
 
 fn_checksum() {
     a_filepath="${1}"
 
-    if command -v sha1sum > /dev/null; then
+    cmd_shasum='sha1sum'
-        sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
-    fi
-
     if command -v shasum > /dev/null; then
-        shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
+        cmd_shasum='shasum'
-        return 0
     fi
 
-    if command -v sha1 > /dev/null; then
+    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-        return 0
-    fi
-
-    echo >&2 "    warn: no sha1 sum program"
-    date '+%F %H:%M'
 }
 
-##############################################
+fn_sub_home() { (
-#                                            #
+    my_rel=${HOME}
-#          Detect TTY and run main           #
+    my_abs=${1}
-#                                            #
+    echo "${my_abs}" | sed "s:^${my_rel}:~:"
-##############################################
-
-fn_is_tty() {
-    if test "${WEBI_TTY}" = 'tty'; then
-        return 0
-    fi
-    return 1
-}
-
-fn_detect_tty() { (
-    # stdin will NOT be a tty if it's being piped
-    # stdout & stderr WILL be a tty even when piped
-    # they are not a tty if being captured or redirected
-    # 'set -i' is NOT available in sh
-    if test -t 1 && test -t 2; then
-        return 0
-    fi
-
-    return 1
 ); }
 
 main() { (
-    set -e
+    fn_show_welcome
-    set -u
+    export WEBI_WELCOME=true
-
-    WEBI_TTY="${WEBI_TTY:-}"
-    if test -z "${WEBI_TTY}"; then
-        if fn_detect_tty; then
-            WEBI_TTY="tty"
-        fi
-        export WEBI_TTY
-    fi
-
-    if test -z "${WEBI_WELCOME:-}"; then
-        fn_show_welcome
-    fi
-    export WEBI_WELCOME='shown'
 
     # note: we may support custom locations in the future
     export WEBI_HOME="${HOME}/.local"
     b_home="$(fn_sub_home "${WEBI_HOME}")"
     b_webi_path="${WEBI_HOME}/bin/webi"
     b_webi_path_rel="${b_home}/bin/webi"
+    webi_upgrade "${b_webi_path}"
 
-    WEBI_CURRENT="${WEBI_CURRENT:-}"
-    if test "${WEBI_CURRENT}" != "${WEBI_CHECKSUM}"; then
-        webi_bootstrap "${b_webi_path}"
-        export WEBI_CURRENT="${WEBI_CHECKSUM}"
-    fi
-
-    echo "    Running $(t_cmd "${b_webi_path_rel} ${WEBI_PKG}")"
     echo ""
-
+    echo "$(t_strong 'Installing') $(t_stronger "${WEBI_PKG}") $(t_strong '...')"
+    echo "    Running $(t_cmd "${b_webi_path_rel} ${WEBI_PKG}")"
     "${b_webi_path}" "${WEBI_PKG}"
 ); }
 
+set -e
+set -u
 main

_webi/install-package.tpl.ps1

@@ -69,7 +69,7 @@ function Invoke-DownloadUrl {
         Write-Host "        ?$Params"
         $URL = "${URL}?${Params}"
     }
-    curl.exe '-#' -f -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
+    curl.exe '-#' --fail-with-body -sS -A $Env:WEBI_UA $URL | Out-File $TmpPath
 
     Remove-Item -Path $Path -Force -ErrorAction Ignore
     Move-Item $TmpPath $Path

_webi/install-package.tpl.sh

@@ -0,0 +1,695 @@
+#!/bin/sh
+
+__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'
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
+        my_libc='gnu'
+    else
+        my_libc='libc'
+    fi
+    WEBI_UA="$(uname -s)/$(uname -r) $(uname -m)/unknown ${my_libc}"
+
+    #WEBI_PKG=
+    #PKG_NAME=
+    #WEBI_OS=
+    #WEBI_ARCH=
+    #WEBI_LIBC=
+    #WEBI_HOST=
+    #WEBI_RELEASES=
+    #WEBI_CSV=
+    #WEBI_TAG=
+    #WEBI_VERSION=
+    #WEBI_MAJOR=
+    #WEBI_MINOR=
+    #WEBI_PATCH=
+    # TODO not sure if BUILD is the best name for this
+    #WEBI_BUILD=
+    #WEBI_GIT_TAG=
+    #WEBI_LTS=
+    #WEBI_CHANNEL=
+    #WEBI_EXT=
+    #WEBI_FORMATS=
+    #WEBI_PKG_URL=
+    #WEBI_PKG_FILE=
+    #WEBI_PKG_PATHNAME=
+    #PKG_OSES=
+    #PKG_ARCHES=
+    #PKG_LIBCS=
+    #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}"
+
+    export WEBI_HOST
+
+    ##
+    ## Set up tmp, download, and install directories
+    ##
+
+    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/.local/bin"
+    mkdir -p "$HOME/.local/opt"
+
+    if test -e ~/.local/bin; then
+        echo "Found ~/.local/bin"
+    else
+        echo "Creating ~/.local/bin"
+        mkdir -p "$HOME/.local/bin"
+    fi
+
+    if test -e ~/.local/bin/webi; then
+        echo "Found ~/.local/bin/webi"
+    else
+        echo "Creating ~/.local/bin"
+        mkdir -p "$HOME/.local/bin"
+    fi
+
+    ##
+    ## Detect http client
+    ##
+    set +e
+    WEBI_CURL="$(command -v curl)"
+    export WEBI_CURL
+    WEBI_WGET="$(command -v wget)"
+    export WEBI_WGET
+    set -e
+
+    # get the special formatted version
+    # (i.e. "go is go1.14" while node is "node v12.10.8")
+    my_versioned_name=""
+    _webi_canonical_name() {
+        if [ -n "$my_versioned_name" ]; then
+            echo "$my_versioned_name"
+            return 0
+        fi
+
+        if command -v pkg_format_cmd_version > /dev/null; then
+            my_versioned_name="'$(pkg_format_cmd_version "$WEBI_VERSION")'"
+        else
+            my_versioned_name="'$pkg_cmd_name v$WEBI_VERSION'"
+        fi
+
+        echo "$my_versioned_name"
+    }
+
+    # Update symlinks as per $HOME/.local/opt and $HOME/.local/bin install paths.
+    webi_link() {
+        if command -v pkg_link > /dev/null; then
+            pkg_link
+            return 0
+        fi
+
+        if test -n "${WEBI_SINGLE}"; then
+            rm -rf "$pkg_dst_cmd"
+            ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
+        else
+            # 'pkg_dst' will default to $HOME/.local/opt/<pkg>
+            # 'pkg_src' will be the installed version,
+            # such as to $HOME/.local/opt/<pkg>-<version>
+            rm -rf "$pkg_dst"
+            ln -s "$pkg_src" "$pkg_dst"
+        fi
+    }
+
+    # detect if this program is already installed
+    # or if an installed version may cause conflict
+    webi_check_installed() {
+        # Test for existing version
+        set +e
+        my_path="$PATH"
+        PATH="$(dirname "$pkg_dst_cmd"):$PATH"
+        export PATH
+        my_current_cmd="$(command -v "$pkg_cmd_name")"
+        set -e
+        if [ -n "$my_current_cmd" ]; then
+            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:"
+                my_dst_rel="$(
+                    webi_sub_home "${pkg_dst}"
+                )"
+                printf "    %s" "${my_dst_rel}"
+                if [ "${pkg_src_cmd}" != "${my_current_cmd}" ]; then
+                    my_src_rel="$(
+                        webi_sub_home "${pkg_src}"
+                    )"
+                    printf " => %s" "${my_src_rel}"
+                fi
+                echo ""
+                exit 0
+            fi
+            if [ -x "$pkg_src_cmd" ]; then
+                webi_link
+                echo "switched to $my_canonical_name:"
+                my_src_rel="$(
+                    webi_sub_home "${pkg_src}"
+                )"
+                my_dst_rel="$(
+                    webi_sub_home "${pkg_dst}"
+                )"
+                echo "    ${my_dst_rel} => ${my_src_rel}"
+                exit 0
+            fi
+        fi
+        export PATH="$my_path"
+    }
+
+    webi_check_available() {
+        if test "$WEBI_CHANNEL" != "error"; then
+            return 0
+        fi
+
+        echo >&2 "Error: no '${PKG_NAME:-"Unknown Package"}@${WEBI_TAG:-"Unknown Tag"}' release for '${WEBI_OS:-"Unknown OS"}' (${WEBI_LIBC:-"Unknown Libc"}) on '${WEBI_ARCH:-"Unknown CPU"}' as one of '${WEBI_FORMATS:-"Unknown File Type"}'"
+        echo >&2 "       '$PKG_NAME' is available for '$PKG_OSES' ($PKG_LIBCS) 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:?.*::'
+        )"
+        my_release_params="$(
+            echo "$WEBI_RELEASES" |
+                sed 's:.*?:?:'
+        )"
+        echo >&2 "       Double check at ${my_release_url}"
+        echo >&2 "           ${my_release_params}"
+        echo >&2 ""
+
+        exit 1
+    }
+
+    is_interactive_shell() {
+        # $- shows shell flags (error,unset,interactive,etc)
+        case $- in
+            *i*) return 0 ;;
+            *) return 1 ;;
+        esac
+    }
+
+    webi_sub_home() { (
+        my_rel=${HOME}
+        my_abs=${1}
+        echo "${my_abs}" | sed "s:^${my_rel}:~:"
+    ); }
+
+    # detect if file is downloaded, and how to download it
+    webi_download() {
+        my_url="${1}"
+        my_dl="${2}"
+        my_dl_name="${3:-${PKG_NAME}}"
+
+        my_dl_rel="$(
+            webi_sub_home "${my_dl}"
+        )"
+
+        WEBI_PKG_DOWNLOAD="${my_dl}"
+        export WEBI_PKG_DOWNLOAD
+
+        if [ -e "${my_dl}" ]; then
+            echo "Found ${my_dl_rel}"
+            return 0
+        fi
+
+        echo "Downloading ${my_dl_name} from"
+        echo "$my_url"
+
+        # It's only 2020, we can't expect to have reliable CLI tools
+        # to tell us the size of a file as part of a base system...
+        if [ -n "$WEBI_WGET" ]; then
+            # wget has resumable downloads
+            # TODO wget -c --content-disposition "$my_url"
+            set +e
+            my_show_progress=""
+            if is_interactive_shell; 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
+                echo >&2 "failed to download from $WEBI_PKG_URL"
+                exit 1
+            fi
+            set -e
+        else
+            # Neither GNU nor BSD curl have sane resume download options, hence we don't bother
+            my_show_progress="-#"
+            if is_interactive_shell; then
+                my_show_progress=""
+            fi
+            # shellcheck disable=SC2086
+            # we want the flags to be split
+            curl -fSL $my_show_progress -H "User-Agent: curl $WEBI_UA" "$my_url" -o "$my_dl.part"
+        fi
+        mv "$my_dl.part" "$my_dl"
+
+        echo ""
+        echo "Saved as ${my_dl_rel}"
+    }
+
+    webi_git_clone() { (
+        my_url="${1}"
+        my_dl="${2}"
+
+        my_dl_rel="$(
+            webi_sub_home "${my_dl}"
+        )"
+        if [ -e "${my_dl}" ]; then
+            echo "Found ${my_dl_rel}"
+
+            cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
+            return 0
+        fi
+
+        echo "Cloning ${my_url}"
+        cmd_git="git clone --config advice.detachedHead=false --quiet --depth=1 --single-branch"
+        rm -rf "${my_dl}.part"
+        if ! $cmd_git "${my_url}" --branch "${WEBI_GIT_TAG}" "${my_dl}.part"; then
+            echo >&2 "failed to git clone ${WEBI_PKG_URL}"
+            exit 1
+        fi
+        mv "${my_dl}.part" "${my_dl}"
+
+        cp -RPp "${my_dl}" "${WEBI_TMP}/${WEBI_PKG_FILE}/"
+    ); }
+
+    # detect which archives can be used
+    webi_extract() {
+        (
+            cd "$WEBI_TMP"
+
+            my_dl_rel="$(
+                webi_sub_home "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+            )"
+            if [ "tar" = "$WEBI_EXT" ]; then
+                echo "Extracting ${my_dl_rel}"
+                tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
+            elif [ "zip" = "$WEBI_EXT" ]; then
+                echo "Extracting ${my_dl_rel}"
+                unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
+            elif [ "exe" = "$WEBI_EXT" ]; then
+                echo "Moving ${my_dl_rel}"
+                mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
+            elif [ "git" = "$WEBI_EXT" ]; then
+                echo "Moving ${my_dl_rel}"
+                mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
+            elif [ "xz" = "$WEBI_EXT" ]; then
+                echo "Inflating ${my_dl_rel}"
+                unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
+            else
+                echo "Failed to extract ${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
+                exit 1
+            fi
+        )
+    }
+
+    # use 'pathman' to update $HOME/.config/envman/PATH.env
+    webi_path_add() {
+        my_path="${1}"
+
+        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
+        fi
+
+        echo "${my_export}" >> ~/.config/envman/PATH.env
+
+        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
+    }
+
+    # group common pre-install tasks as default
+    webi_pre_install() {
+        webi_check_installed
+        webi_check_available
+        if test "git" = "${WEBI_EXT}"; then
+            webi_git_clone \
+                "${WEBI_PKG_URL}" \
+                "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+            return 0
+        fi
+        webi_download \
+            "${WEBI_PKG_URL}" \
+            "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
+        webi_extract
+    }
+
+    # move commands from the extracted archive directory
+    # to $HOME/.local/opt or $HOME/.local/bin
+    webi_install() {
+        if test -n "${WEBI_SINGLE}"; then
+            mkdir -p "$(dirname "$pkg_src_cmd")"
+            mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
+        else
+            rm -rf "$pkg_src"
+            mv ./"$pkg_cmd_name"* "$pkg_src"
+        fi
+    }
+
+    # run post-install functions - just updating PATH by default
+    webi_post_install() {
+        if test -n "${pkg_no_exec}"; then
+            return 0
+        fi
+
+        webi_path_add "$(dirname "$pkg_dst_cmd")"
+    }
+
+    _webi_enable_exec() {
+        if command -v spctl > /dev/null && command -v xattr > /dev/null; then
+            # note: some packages contain files that cannot be affected by xattr
+            xattr -r -d com.apple.quarantine "$pkg_src" || true
+            return 0
+        fi
+    }
+
+    _webi_done_message() {
+        my_dst_rel="$(
+            webi_sub_home "${pkg_dst_cmd}"
+        )"
+        my_canonical_name="$(
+            _webi_canonical_name
+        )"
+        echo "Installed ${my_canonical_name} as ${my_dst_rel}"
+    }
+
+    ##
+    ##
+    ## BEGIN custom override functions from <package>/install.sh
+    ##
+    ##
+
+    WEBI_SINGLE=
+
+    if [ -z "${WEBI_WELCOME-}" ]; then
+        echo ""
+        printf "Thanks for using webi to install '\e[32m%s\e[0m' on '\e[33m%s (%s) %s\e[0m'.\n" "${WEBI_PKG:-"Unknown Package"}" "$(uname -s)" "${WEBI_LIBC:-"Unknown Libc"}" "$(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 ""
+        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 ""
+    fi
+
+    WEBI_WELCOME=true
+    export WEBI_WELCOME
+
+    __init_installer() {
+        # the installer will be injected here
+        # {{ installer }}
+
+        return 0
+    }
+
+    __init_installer
+
+    ##
+    ##
+    ## END custom override functions
+    ##
+    ##
+
+    # 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
+
+        pkg_cmd_name="${pkg_cmd_name:-$PKG_NAME}"
+
+        pkg_no_exec="${pkg_no_exec:-}"
+
+        if [ -n "${pkg_no_exec}" ]; then
+            pkg_dst_cmd="${pkg_dst}"
+            pkg_src="${pkg_dst}"
+            pkg_src_cmd="${pkg_dst}"
+        elif [ -n "${WEBI_SINGLE}" ]; then
+            pkg_dst_cmd="${pkg_dst_cmd:-$HOME/.local/bin/$pkg_cmd_name}"
+            pkg_dst="$pkg_dst_cmd"
+
+            #pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name-v$WEBI_VERSION}"
+            pkg_src_cmd="${pkg_src_cmd:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION/bin/$pkg_cmd_name}"
+            pkg_src="$pkg_src_cmd"
+        else
+            pkg_dst="${pkg_dst:-$HOME/.local/opt/$pkg_cmd_name}"
+            pkg_dst_cmd="${pkg_dst_cmd:-$pkg_dst/bin/$pkg_cmd_name}"
+
+            pkg_src="${pkg_src:-$HOME/.local/opt/$pkg_cmd_name-v$WEBI_VERSION}"
+            pkg_src_cmd="${pkg_src_cmd:-$pkg_src/bin/$pkg_cmd_name}"
+        fi
+        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
+        pkg_src_bin="$(dirname "$pkg_src_cmd")"
+        # shellcheck disable=SC2034 # used in ${WEBI_PKG}/install.sh
+        pkg_dst_bin="$(dirname "$pkg_dst_cmd")"
+
+        if command -v pkg_pre_install > /dev/null; then pkg_pre_install; else webi_pre_install; fi
+
+        (
+            cd "$WEBI_TMP"
+            my_src_rel="$(
+                webi_sub_home "${pkg_src_cmd}"
+            )"
+            if test -e "${pkg_src_cmd}"; then
+                echo "Found ${my_src_rel} (remove to force reinstall)"
+            else
+                echo "Installing to ${my_src_rel}"
+                if command -v pkg_install > /dev/null; then pkg_install; else webi_install; fi
+                chmod a+x "$pkg_src"
+                chmod a+x "$pkg_src_cmd"
+            fi
+        )
+
+        if test -z "${pkg_no_exec}"; then
+            webi_link
+            _webi_enable_exec
+        fi
+        (
+            cd "$WEBI_TMP"
+            if command -v pkg_post_install > /dev/null; then pkg_post_install; else webi_post_install; fi
+        )
+
+        (
+            cd "$WEBI_TMP"
+            if command -v pkg_done_message > /dev/null; then pkg_done_message; else _webi_done_message; fi
+        )
+
+        echo ""
+    fi
+
+    webi_path_add "$HOME/.local/bin"
+    if [ -z "${_WEBI_CHILD-}" ] && [ -f "$_webi_tmp/.PATH.env" ]; then
+        if test -s "$_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"
+
+            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
+
+    rm -rf "$WEBI_TMP"
+}
+
+__bootstrap_webi

_webi/lint-builds.js

@@ -1,338 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-let Fs = require('node:fs/promises');
-let Path = require('node:path');
-
-let BuildsCacher = require('./builds-cacher.js');
-let HostTargets = require('./build-classifier/host-targets.js');
-let Parallel = require('./parallel.js');
-
-var INSTALLERS_DIR = Path.join(__dirname, '..');
-var CACHE_DIR = Path.join(__dirname, '../_cache');
-
-let UserAgentsMap = require('./build-classifier/uas.json');
-let uas = Object.keys(UserAgentsMap);
-let uaTargetsMap = {};
-for (let ua of uas) {
-  let terms = ua.split(/[\s\/]+/g);
-  let target = {};
-  void HostTargets.termsToTarget(target, terms);
-  if (!target) {
-    continue;
-  }
-  if (target.errors.length) {
-    throw target.errors[0];
-  }
-  if (!target.os) {
-    // TODO make target null, or create error for this
-    console.warn(`no os for terms: ${terms}`);
-    //throw new Error(`terms: ${terms}`);
-    continue;
-  }
-  if (!target.arch) {
-    // TODO make target null, or create error for this
-    console.warn(`no arch for terms: ${terms}`);
-    //throw new Error(`terms: ${terms}`);
-    continue;
-  }
-  if (!target.libc) {
-    // TODO make target null, or create error for this
-    console.warn(`no libc for terms: ${terms}`);
-    //throw new Error(`terms: ${terms}`);
-    continue;
-  }
-  let triplet = `${target.os}-${target.arch}-${target.libc}`;
-  uaTargetsMap[triplet] = target;
-}
-let uaTargets = [];
-let triplets = Object.keys(uaTargetsMap);
-for (let triplet of triplets) {
-  let target = uaTargetsMap[triplet];
-  uaTargets.push(target);
-}
-
-function showDirs(dirs) {
-  {
-    let errors = Object.keys(dirs.errors);
-    console.error('');
-    console.error(`Errors: ${errors.length}`);
-    for (let name of errors) {
-      let err = dirs.errors[name];
-      console.error(`${name}/: ${err.message}`);
-    }
-  }
-
-  {
-    let hidden = Object.keys(dirs.hidden);
-    console.debug('');
-    console.debug(`Hidden: ${hidden.length}`);
-    for (let name of hidden) {
-      let kind = dirs.hidden[name];
-      if (kind === '!directory') {
-        console.debug(`    ${name}`);
-      } else {
-        console.debug(`    ${name}/`);
-      }
-    }
-  }
-
-  {
-    let alias = Object.keys(dirs.alias);
-    console.debug('');
-    console.debug(`Alias: ${alias.length}`);
-    for (let name of alias) {
-      let kind = dirs.alias[name];
-      if (kind === 'symlink') {
-        console.debug(`    ${name} => ...`);
-      } else {
-        console.debug(`    ${name}/`);
-      }
-    }
-  }
-
-  {
-    let invalids = Object.keys(dirs.invalid);
-    console.warn('');
-    console.warn(`Invalid: ${invalids.length}`);
-    for (let name of invalids) {
-      console.warn(`    ${name}/`);
-    }
-  }
-
-  {
-    let selfhosted = Object.keys(dirs.selfhosted);
-    console.info('');
-    console.info(`Self-Hosted: ${selfhosted.length}`);
-    for (let name of selfhosted) {
-      console.info(`    ${name}/`);
-    }
-  }
-
-  {
-    let valids = Object.keys(dirs.valid);
-    console.info('');
-    console.info(`Found: ${valids.length}`);
-    for (let name of valids) {
-      console.info(`    ${name}/`);
-    }
-  }
-}
-
-let bc = BuildsCacher.create({
-  caches: CACHE_DIR,
-  installers: INSTALLERS_DIR,
-});
-
-async function main() {
-  /* jshint maxcomplexity: 25 */
-  // TODO
-  //     node ./_webi/lint-builds.js caddy@beta 'x86_64/unknown Darwin libc'
-  //
-  //let [projName, userAgent] = process.argv.slice(2);
-  let projName = process.argv[2];
-  // create test case for zoxide, goreleaser, go, yq, caddy, rg
-
-  let dirs = await bc.getProjectsByType();
-  if (!projName) {
-    showDirs(dirs);
-    console.info('');
-  }
-
-  bc.freshenRandomPackage(600 * 1000);
-
-  let rows = [];
-  let triples = [];
-  let valids = Object.keys(dirs.valid);
-
-  if (projName) {
-    if (!valids.includes(projName)) {
-      throw new Error(`'${projName}' is not a valid installable project`);
-    }
-    valids = [projName];
-  }
-  //valids = ['atomicparsley', 'caddy', 'macos'];
-  //valids = ['atomicparsley'];
-
-  console.info('');
-  console.info(`Fetching project release assets`);
-  let parallel = 25;
-  let projects = [];
-  await Parallel.run(parallel, valids, getAll);
-  async function getAll(name, i) {
-    console.info(`    ${name}`);
-    let projInfo = await bc.getPackages({
-      //Releases: Releases,
-      name: name,
-      date: new Date(),
-    });
-    projects[i] = projInfo;
-  }
-
-  console.info(`Classifying build assets for...`);
-  for (let projInfo of projects) {
-    console.info(`    ${projInfo.name}`);
-
-    let nStr = projInfo.releases.length.toString();
-    let n = nStr.padStart(5, ' ');
-    let row = `##### ${n}\t${projInfo.name}\tv`;
-    rows.push(row);
-
-    // ignore known, non-package extensions
-    for (let build of projInfo.releases) {
-      let target = bc.classify(projInfo, build);
-      if (!target) {
-        // non-build file
-        continue;
-      }
-
-      if (target.error) {
-        let e = target.error;
-        if (e.code === 'E_BUILD_NO_PATTERN') {
-          console.warn(`>>> ${e.message} <<<`);
-          console.warn(projInfo);
-          console.warn(build);
-          console.warn(`^^^ ${e.message} ^^^`);
-        }
-        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}`);
-      // }
-      // // For debug printing versions
-      // console.error(build.version);
-      rows.push(`${target.triplet}\t${projInfo.name}\t${build.version}`);
-    }
-  }
-
-  console.info(`Fetching builds for`);
-  for (let projInfo of projects) {
-    console.info('');
-    console.info('');
-    console.info(`    ${projInfo.name}`);
-
-    for (let target of uaTargets) {
-      let libc = target.libc || 'libc';
-      let hostTriplet = `${target.os}-${target.arch}-${libc}`;
-      console.info('');
-      console.info(`    target: ${hostTriplet}`);
-      let match = bc.findMatchingPackages(projInfo, target, {
-        ver: '',
-      });
-      if (!match) {
-        console.info(
-          `    project: ${projInfo.name}: missing build for os '${target.os}'`,
-        );
-        continue;
-      }
-
-      if (!match.releases) {
-        console.info(
-          `    project: ${projInfo.name}: missing build for os '${target.os}-${target.arch}-${libc}'`,
-        );
-      } else if (match.triplet === hostTriplet) {
-        let releaseNames = Object.keys(match.releases);
-        console.info(`    selected ${releaseNames.length}`);
-      } else {
-        let releaseNames = Object.keys(match.releases);
-        console.info(
-          `    selected ${releaseNames.length} (${match.triplet} fallback)`,
-        );
-      }
-    }
-  }
-
-  let tsv = rows.join('\n');
-  console.info('');
-  console.info('#rows', rows.length);
-  await Fs.writeFile('builds.tsv', tsv, 'utf8');
-
-  console.info('');
-  console.info('Triplets Detected:');
-  let triplets = Object.keys(bc._triplets);
-  if (triplets.length) {
-    triplets.sort();
-    console.info('   ', triplets.join('\n    '));
-  } else {
-    console.info('    (none)');
-  }
-
-  console.info('');
-  console.info('New / Unknown Terms:');
-  let unknowns = Object.keys(bc.unknownTerms);
-  if (unknowns.length) {
-    unknowns.sort();
-    console.warn('   ', unknowns.join('\n    '));
-  } else {
-    console.info('    (none)');
-  }
-
-  console.info('');
-  console.info('Unused Terms:');
-  let unuseds = Object.keys(bc.orphanTerms);
-  if (unuseds.length) {
-    unuseds.sort();
-    console.warn('   ', unuseds.join('\n    '));
-  } else {
-    console.info('    (none)');
-  }
-
-  console.info('');
-  console.info('Formats:');
-  if (bc.formats.length) {
-    let formats = bc.formats.slice();
-    formats.sort();
-    if (!formats[0]) {
-      formats[0] = '(bin)';
-    }
-    console.warn('   ', formats.join('\n    '));
-  } else {
-    console.info('    (none)');
-  }
-
-  // sort -u -k1 builds.tsv | rg -v '^#|^https?:' | rg -i arm
-  // cut -f1 builds.tsv | sort -u -k1 | rg -v '^#|^https?:' | rg -i arm
-}
-
-if (module === require.main) {
-  let times = [];
-  let now = Date.now();
-  main()
-    .then(async function () {
-      let then = Date.now();
-      let delta = then - now;
-      times.push(delta);
-      now = then;
-      await main();
-      then = Date.now();
-      delta = then - now;
-      times.push(delta);
-    })
-    .then(function () {
-      console.info('');
-      console.info('Run times');
-      for (let delta of times) {
-        let s = delta / 1000;
-        console.info(`    ${s}`);
-      }
-
-      function forceExit() {
-        console.warn(`warn: dangling event loop reference`);
-        process.exit(0);
-      }
-      let exitTimeout = setTimeout(forceExit, 250);
-      exitTimeout.unref();
-    })
-    .catch(function (err) {
-      console.error(err.stack || err);
-      process.exit(1);
-    });
-}

_webi/normalize.js

@@ -29,14 +29,14 @@ formats.forEach(function (name) {
 // evaluation order matters
 // (i.e. otherwise x86 and x64 can cross match)
 var arches = [
-  // arm64/aarch64 has very high specificity, so it comes first
+  // arm 7 cannot be confused with arm64
-  'arm64',
-  // arm 7 is also generic aarch/arm/arm32
   'armv7l',
-  // arm6 can run on armv7
+  // amd64 is more likely than arm64
-  'armv6l',
-  // amd64 is more likely and less often specified than arm64
   'amd64',
+  // arm6 has the same prefix as arm64
+  'armv6l',
+  // arm64 is more likely than arm6, and should be the default
+  'arm64',
   'x86',
   'ppc64le',
   'ppc64',
@@ -50,13 +50,13 @@ var arches = [
 // https://git.com/org/foo/releases/v0.7.9/foo-x86_64-linux-musl.tar.gz
 //
 var archMap = {
-  arm64: /(\b|_)(aarch64|arm64)/i,
+  armv7l: /(\b|_)(arm32|armv?7l?)/i,
-  armv7l: /(\b|_)(arm32|arm[_\-]?v?7l?)/i,
-  armv6l: /(\b|_)(arm|aarch32|arm[_\-]?v?6l?)(\b|_)/i,
   //amd64: /(amd.?64|x64|[_\-]64)/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,

_webi/packages.js

@@ -1 +0,0 @@
-projects.js

_webi/packages.js

@@ -0,0 +1,96 @@
+'use strict';
+
+var frontmarker = require('./frontmarker.js');
+var fs = require('fs');
+var path = require('path');
+
+var pkgs = module.exports;
+pkgs.create = function (Pkgs, basepath) {
+  if (!Pkgs) {
+    Pkgs = {};
+  }
+  if (!basepath) {
+    basepath = path.join(__dirname, '../');
+  }
+
+  Pkgs.all = function () {
+    return fs.promises.readdir(basepath).then(function (nodes) {
+      var items = [];
+      return nodes
+        .reduce(function (p, node) {
+          return p.then(function () {
+            return pkgs.get(node).then(function (meta) {
+              if (meta && '_' !== node[0]) {
+                meta.name = node;
+                items.push(meta);
+              }
+            });
+          });
+        }, Promise.resolve())
+        .then(function () {
+          return items;
+        });
+    });
+  };
+
+  Pkgs.get = function (node) {
+    return fs.promises.access(path.join(basepath, node)).then(function () {
+      return Pkgs._get(node);
+    });
+  };
+  Pkgs._get = function (node) {
+    var curlbash = path.join(basepath, node, 'install.sh');
+    var readme = path.join(basepath, node, 'README.md');
+    var winstall = path.join(basepath, node, 'install.ps1');
+    return Promise.all([
+      fs.promises
+        .readFile(readme, 'utf-8')
+        .then(function (txt) {
+          // TODO
+          return frontmarker.parse(txt);
+        })
+        .catch(function (e) {
+          if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
+            console.error("failed to read '" + node + "/README.md'");
+            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.access(winstall).catch(function (e) {
+        // no winstaller
+        winstall = '';
+        if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
+          console.error("failed to read '" + node + "/install.ps1'");
+          console.error(e);
+        }
+      }),
+    ]).then(function (items) {
+      var meta = items[0] || items[1];
+      if (!meta) {
+        // doesn't exist
+        return;
+      }
+      meta.windows = !!winstall;
+      meta.bash = !!curlbash;
+
+      return meta;
+    });
+  };
+
+  return Pkgs;
+};
+pkgs.create(pkgs);
+
+if (module === require.main) {
+  pkgs.all().then(function (data) {
+    console.info('package info:');
+    console.info(data);
+  });
+}

_webi/parallel.js

@@ -1,44 +0,0 @@
-'use strict';
-
-var Parallel = module.exports;
-Parallel.run = async function (limit, arr, fn) {
-  let index = 0;
-  let actives = [];
-  let results = [];
-  limit = Math.min(limit, arr.length);
-
-  function launch() {
-    let _index = index;
-    let p = fn(arr[_index], _index, arr);
-
-    // some tasks may be synchronous
-    // so we must push before removing
-    actives.push(p);
-
-    p.then(function _resolve(result) {
-      let i = actives.indexOf(p);
-      actives.splice(i, 1);
-      results[_index] = result;
-    });
-
-    index += 1;
-  }
-
-  // start tasks in parallel, up to limit
-  for (; actives.length < limit; ) {
-    launch();
-  }
-
-  // keep the task queue full
-  for (; index < arr.length; ) {
-    // wait for one task to complete
-    await Promise.race(actives);
-    // add one task again
-    launch();
-  }
-
-  // wait for all remaining tasks
-  await Promise.all(actives);
-
-  return results;
-};

_webi/projects.js

@@ -1,96 +0,0 @@
-'use strict';
-
-var frontmarker = require('./frontmarker.js');
-var fs = require('fs');
-var path = require('path');
-
-var pkgs = module.exports;
-pkgs.create = function (Pkgs, basepath) {
-  if (!Pkgs) {
-    Pkgs = {};
-  }
-  if (!basepath) {
-    basepath = path.join(__dirname, '../');
-  }
-
-  Pkgs.all = function () {
-    return fs.promises.readdir(basepath).then(function (nodes) {
-      var items = [];
-      return nodes
-        .reduce(function (p, node) {
-          return p.then(function () {
-            return pkgs.get(node).then(function (meta) {
-              if (meta && '_' !== node[0]) {
-                meta.name = node;
-                items.push(meta);
-              }
-            });
-          });
-        }, Promise.resolve())
-        .then(function () {
-          return items;
-        });
-    });
-  };
-
-  Pkgs.get = function (node) {
-    return fs.promises.access(path.join(basepath, node)).then(function () {
-      return Pkgs._get(node);
-    });
-  };
-  Pkgs._get = function (node) {
-    var curlbash = path.join(basepath, node, 'install.sh');
-    var readme = path.join(basepath, node, 'README.md');
-    var winstall = path.join(basepath, node, 'install.ps1');
-    return Promise.all([
-      fs.promises
-        .readFile(readme, 'utf-8')
-        .then(function (txt) {
-          // TODO
-          return frontmarker.parse(txt);
-        })
-        .catch(function (e) {
-          if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
-            console.error("failed to read '" + node + "/README.md'");
-            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.access(winstall).catch(function (e) {
-        // no winstaller
-        winstall = '';
-        if ('ENOENT' !== e.code && 'ENOTDIR' !== e.code) {
-          console.error("failed to read '" + node + "/install.ps1'");
-          console.error(e);
-        }
-      }),
-    ]).then(function (items) {
-      var meta = items[0] || items[1];
-      if (!meta) {
-        // doesn't exist
-        return;
-      }
-      meta.windows = !!winstall;
-      meta.bash = !!curlbash;
-
-      return meta;
-    });
-  };
-
-  return Pkgs;
-};
-pkgs.create(pkgs);
-
-if (module === require.main) {
-  pkgs.all().then(function (data) {
-    console.info('package info:');
-    console.info(data);
-  });
-}

_webi/releases.js

@@ -1,22 +1,37 @@
 'use strict';
 
-var Installers = module.exports;
+var fs = require('node:fs');
-
-var Crypto = require('crypto');
-var Fs = require('node:fs/promises');
 var path = require('node:path');
+var request = require('@root/request');
+var _normalize = require('../_webi/normalize.js');
 
 var reInstallTpl = /\s*#?\s*{{ installer }}/;
 
+var Releases = module.exports;
+Releases.get = async function (pkgdir) {
+  let 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;
+  }
+
+  let all = await get(request);
+
+  return _normalize(all);
+};
+
 function padScript(txt) {
   return txt.replace(/^/g, '        ');
 }
 
 var BAD_SH_RE = /[<>'"`$\\]/;
-Installers.renderBash = async function (
+Releases.renderBash = async function (
   pkgdir,
   rel,
-  { baseurl, pkg, tag, ver, os = '', arch = '', libc = '', formats, latest },
+  { baseurl, pkg, tag, ver, os = '', arch = '', libc = '', formats },
 ) {
   if (!Array.isArray(formats)) {
     formats = [];
@@ -24,7 +39,10 @@ Installers.renderBash = async function (
   if (!tag) {
     tag = '';
   }
-  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.sh'), 'utf8');
+  let installTxt = await fs.promises.readFile(
+    path.join(pkgdir, 'install.sh'),
+    'utf8',
+  );
   installTxt = padScript(installTxt);
   var vers = rel.version.split('.');
   var v = {
@@ -37,8 +55,8 @@ Installers.renderBash = async function (
       .replace(/^-/, ''),
   };
   var pkgFile = rel.filename || rel.name;
-  let tplTxt = await Fs.readFile(
+  let tplTxt = await fs.promises.readFile(
-    path.join(__dirname, 'package-install.tpl.sh'),
+    path.join(__dirname, 'install-package.tpl.sh'),
     'utf8',
   );
   // ex: 'node@lts' or 'node'
@@ -72,17 +90,14 @@ Installers.renderBash = async function (
   ]
     .join(',')
     .replace(/'/g, '');
-
-  let webiChecksum = await Installers.getWebiShChecksum();
   let envReplacements = [
-    ['WEBI_CHECKSUM', webiChecksum],
     ['WEBI_PKG', webiPkg],
     ['WEBI_HOST', baseurl],
     ['WEBI_OS', os],
     ['WEBI_ARCH', arch],
     ['WEBI_LIBC', libc],
     ['WEBI_TAG', tag],
-    ['WEBI_RELEASES', `${baseurl}${releaseUrl}`],
+    ['WEBI_RELEASES', `${baseurl}/${releaseUrl}`],
     ['WEBI_CSV', releaseCsv],
     ['WEBI_VERSION', rel.version],
     ['WEBI_MAJOR', v.major],
@@ -93,17 +108,16 @@ 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],
     ['WEBI_PKG_FILE', pkgFile], // TODO replace with pathname
     ['PKG_NAME', pkg],
-    ['PKG_OSES', (rel.oses || []).join(' ')],
+    ['PKG_OSES', rel.oses],
-    ['PKG_ARCHES', (rel.arches || []).join(' ')],
+    ['PKG_ARCHES', rel.arches],
-    ['PKG_LIBCS', (rel.libcs || []).join(' ')],
+    ['PKG_LIBCS', rel.libcs],
-    ['PKG_FORMATS', (rel.formats || []).join(' ')],
+    ['PKG_FORMATS', (rel.formats || []).join(',')],
-    ['PKG_LATEST', latest],
   ];
 
   for (let env of envReplacements) {
@@ -113,7 +127,7 @@ Installers.renderBash = async function (
     // #export WEBI_FOO=xyz => export WEBI_FOO='123'
     // export WEBI_FOO=     => export WEBI_FOO='123'
     let envRe = new RegExp(
-      `^[ \\t]*#?[ \\t]*(export[ \\t])?[ \\t]*(${name})=.*`,
+      `^[ \\t]*#?[ \\t]*(export\\s)?[ \\t]*(${name})=.*`,
       'm',
     );
     if (BAD_SH_RE.test(value)) {
@@ -131,7 +145,7 @@ Installers.renderBash = async function (
   return tplTxt;
 };
 
-Installers.renderPowerShell = async function (
+Releases.renderPowerShell = async function (
   pkgdir,
   rel,
   { baseurl, pkg, tag, ver, os, arch, libc = '', formats },
@@ -142,7 +156,10 @@ Installers.renderPowerShell = async function (
   if (!tag) {
     tag = '';
   }
-  let installTxt = await Fs.readFile(path.join(pkgdir, 'install.ps1'), 'utf8');
+  let installTxt = await fs.promises.readFile(
+    path.join(pkgdir, 'install.ps1'),
+    'utf8',
+  );
   installTxt = padScript(installTxt);
   /*
     var vers = rel.version.split('.');
@@ -156,8 +173,8 @@ Installers.renderPowerShell = async function (
         .replace(/^-/, '')
     };
   */
-  let tplTxt = await Fs.readFile(
+  let tplTxt = await fs.promises.readFile(
-    path.join(__dirname, 'package-install.tpl.ps1'),
+    path.join(__dirname, 'install-package.tpl.ps1'),
     'utf8',
   );
   var pkgver = pkg + '@' + ver;
@@ -201,32 +218,3 @@ Installers.renderPowerShell = async function (
       .replace(reInstallTpl, '\n' + installTxt)
   );
 };
-
-var _webiShMeta = {
-  stale: 10 * 1000,
-  updated_at: 0,
-  checksum: '',
-  mtime: 0,
-};
-Installers.getWebiShChecksum = async function () {
-  let now = Date.now();
-  let ago = now - _webiShMeta.updated_at;
-  if (ago <= _webiShMeta.stale) {
-    return _webiShMeta.checksum;
-  }
-
-  let webiPath = path.join(__dirname, '../webi/webi.sh');
-  let stat = await Fs.stat(webiPath);
-  if (stat.mtimeMs === _webiShMeta.mtime) {
-    return _webiShMeta.checksum;
-  }
-
-  let webiBuf = await Fs.readFile(webiPath, null);
-  let webiHash = Crypto.createHash('sha1').update(webiBuf).digest('hex');
-  let webiChecksum = webiHash.slice(0, 8);
-
-  _webiShMeta.mtime = stat.mtimeMs;
-  _webiShMeta.updated_at = now;
-  _webiShMeta.checksum = webiChecksum;
-  return _webiShMeta.checksum;
-};

_webi/serve-installer.js

@@ -1,16 +1,20 @@
 'use strict';
 
-var InstallerServer = module.exports;
+var Installers = module.exports;
 
-let Fs = require('fs/promises');
+var Crypto = require('crypto');
-let Path = require('path');
+var Fs = require('fs/promises');
+var path = require('path');
 
-let HostTargets = require('./build-classifier/host-targets.js');
+var uaDetect = require('./ua-detect.js');
-let Builds = require('./builds.js');
+var packages = require('./packages.js');
-let Installers = require('./installers.js');
+var Releases = require('./releases.js');
 
-InstallerServer.INSTALLERS_DIR = Path.join(__dirname, '..');
+// handlers caching and transformation, probably should be broken down
-InstallerServer.serveInstaller = async function (
+var getReleases = require('./transform-releases.js');
+
+Installers.INSTALLERS_DIR = path.join(__dirname, '..');
+Installers.serveInstaller = async function (
   baseurl,
   ua,
   pkg,
@@ -19,201 +23,116 @@ InstallerServer.serveInstaller = async function (
   formats,
   libc,
 ) {
-  let unameAgent = ua;
+  let [rel, opts] = await Installers.helper({
-  let projectName = pkg;
+    ua,
-  let [rel, tmplParams] = await InstallerServer.helper({
+    pkg,
-    unameAgent,
-    projectName,
     tag,
     formats,
     libc,
   });
-  Object.assign(tmplParams, {
+  Object.assign(opts, {
     baseurl,
   });
 
-  var pkgdir = Path.join(InstallerServer.INSTALLERS_DIR, projectName);
+  var pkgdir = path.join(Installers.INSTALLERS_DIR, pkg);
   if ('ps1' === ext) {
-    return Installers.renderPowerShell(pkgdir, rel, tmplParams);
+    return Releases.renderPowerShell(pkgdir, rel, opts);
   }
-  return Installers.renderBash(pkgdir, rel, tmplParams);
+  return Releases.renderBash(pkgdir, rel, opts);
 };
+Installers.helper = async function ({ ua, pkg, tag, formats, libc }) {
+  // TODO put some of this in a middleware? or common function?
 
-// TODO put some of this in a middleware? or common function?
+  // TODO maybe move package/version/lts/channel detection into getReleases
-// TODO maybe move package/version/lts/channel detection into getReleases
+  var ver = tag.replace(/^v/, '');
-InstallerServer.helper = async function ({
+  var lts;
-  unameAgent,
+  var channel;
-  projectName,
-  tag,
-  formats,
-  libc,
-}) {
-  console.log(`dbg: Installer User-Agent: ${unameAgent}`);
 
-  let releaseTarget = toReleaseTarget(tag);
+  switch (ver) {
-  let hostFormats = formats;
+    case 'latest':
-  let terms = unameAgent.split(/[\s\/]+/g);
+      ver = '';
-  let hostTarget = {};
+      channel = 'stable';
-  try {
+      break;
-    void HostTargets.termsToTarget(hostTarget, terms);
+    case 'lts':
-  } catch (e) {
+      lts = true;
-    // if we can't guarantee the results...
+      channel = 'stable';
-    // "in the face of ambiguity, refuse the temptation to guess"
+      ver = '';
-    throw e;
+      break;
-  }
+    case 'stable':
-  console.log(`dbg: Installer Host Target:`);
+      channel = 'stable';
-  console.log(hostTarget);
+      ver = '';
-
+      break;
-  if (!hostTarget.os) {
+    case 'beta':
-    throw new Error(`OS could not be identified by User-Agent '${unameAgent}'`);
+      channel = 'beta';
+      ver = '';
+      break;
+    case 'dev':
+      channel = 'dev';
+      ver = '';
+      break;
   }
 
-  console.log(`dbg: Get Project Installer Type for '${projectName}':`);
+  var myOs = uaDetect.os(ua);
-  let proj = await Builds.getProjectType(projectName);
+  var myArch = uaDetect.arch(ua);
-  console.log(proj);
+  var myLibc;
-
+  if (libc) {
-  let validTypes = ['alias', 'selfhosted', 'valid'];
+    myLibc = uaDetect.libc(libc);
-  if (!validTypes.includes(proj.type)) {
-    let msg = `'${projectName}' doesn't have an installer: '${proj.type}': '${proj.detail}'`;
-    let err = new Error(msg);
-    err.code = 'ENOENT';
-    throw err;
   }
-  if (proj.type === 'alias') {
+  if (!myLibc) {
-    projectName = proj.detail;
+    myLibc = uaDetect.libc(ua);
+  }
+  if (!myLibc) {
+    myLibc = 'libc';
   }
 
-  let tmplParams = {
+  let cfg = await packages.get(pkg);
-    pkg: projectName,
+  let releaseQuery = {
-    tag: tag,
+    pkg: cfg.alias || pkg,
-    os: hostTarget.os,
+    ver,
-    arch: hostTarget.arch,
+    os: myOs,
-    libc: hostTarget.libc,
+    arch: myArch,
-    formats: hostFormats,
+    libc: myLibc,
+    lts,
+    channel,
+    // TODO use formats for sorting, not exclusion
+    // (it's better to install xz or report an error to install zip)
+    formats,
     limit: 1,
   };
-  Object.assign(tmplParams, releaseTarget);
-  console.log('tmplParams', tmplParams);
 
-  let errPackage = {
+  let rels = await getReleases(releaseQuery);
-    name: 'doesntexist.ext',
+
-    version: '0.0.0',
+  var rel = rels.releases[0];
-    lts: '-',
+  var opts = {
-    channel: 'error',
+    pkg: cfg.alias || pkg,
-    date: '1970-01-01',
+    ver,
-    os: hostTarget.os || '-',
+    tag,
-    arch: hostTarget.arch || '-',
+    os: myOs,
-    libc: hostTarget.libc || '-',
+    arch: myArch,
-    ext: 'err',
+    libc: myLibc,
-    download: 'https://example.com/doesntexist.ext',
+    lts,
-    comment:
+    channel,
-      'No matches found. Could be bad or missing version info' +
+    formats,
-      ',' +
+    limit: 1,
-      "Check query parameters. Should be something like '/api/releases/{package}@{version}.tab?os={macos|linux|windows|-}&arch={amd64|x86|aarch64|arm64|armv7l|-}&libc={musl|gnu|msvc|libc|static}&limit=10'",
   };
-
+  rel = Object.assign(
-  if (proj.type === 'selfhosted') {
+    {
-    return [errPackage, tmplParams];
+      oses: rels.oses,
-  }
+      arches: rels.arches,
-
+      libcs: rels.libcs,
-  let projInfo = await Builds.getPackage({
+      formats: rels.formats,
-    name: projectName,
+    },
-    date: new Date(),
+    rel,
-  });
-  let latest = projInfo.versions[0];
-  Object.assign(tmplParams, { latest });
-  //console.log('projInfo', projInfo);
-
-  let buildTargetInfo = {
-    triplets: projInfo.triplets,
-    oses: projInfo.oses,
-    arches: projInfo.arches,
-    libcs: projInfo.libcs,
-    formats: projInfo.formats,
-  };
-
-  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];
-  }
-
-  let targetRelease = Builds.findMatchingPackages(
-    projInfo,
-    hostTarget,
-    releaseTarget,
   );
-  // { triplet: `${os}-${arch}-${libc}`, packages: targetPackages
-  // , latest: projInfo.versions[0], versions: matchInfo
-  // }
 
-  if (!targetRelease?.packages) {
+  return [rel, opts];
-    let pkg1 = Object.assign(buildTargetInfo, errPackage);
-    return [pkg1, tmplParams];
-  }
-
-  let buildPkg = Builds.selectPackage(targetRelease.packages, hostFormats);
-  let ext = buildPkg.ext || '.exe';
-  if (ext.startsWith('.')) {
-    ext = ext.slice(1);
-  }
-
-  let version = targetRelease.version;
-  if (version.startsWith('v')) {
-    version = version.slice(1);
-  }
-
-  buildPkg = Object.assign(buildTargetInfo, buildPkg, { ext, version });
-  console.log('dbg: buildPkg', buildPkg);
-  console.log('dbg: tmplParams', tmplParams);
-  return [buildPkg, tmplParams];
 };
 
-let channelNames = [
+var CURL_PIPE_PS1_BOOT = path.join(__dirname, 'curl-pipe-bootstrap.tpl.ps1');
-  'stable',
+var CURL_PIPE_SH_BOOT = path.join(__dirname, 'curl-pipe-bootstrap.tpl.sh');
-  // 'hotfix',
-  'latest',
-  'rc',
-  'preview',
-  'pre',
-  'dev',
-  'beta',
-  'alpha',
-];
-
-function toReleaseTarget(tag) {
-  tag = tag.replace(/^v/, '');
-
-  let releaseTarget = {
-    channel: '',
-    lts: false,
-    version: '',
-  };
-
-  if (tag === 'lts') {
-    releaseTarget.lts = true;
-    releaseTarget.channel = 'stable';
-  } else if (channelNames.includes(tag)) {
-    releaseTarget.channel = tag;
-  } else {
-    releaseTarget.version = tag;
-  }
-
-  return releaseTarget;
-}
-
-var CURL_PIPE_PS1_BOOT = Path.join(__dirname, 'curl-pipe-bootstrap.tpl.ps1');
-var CURL_PIPE_SH_BOOT = Path.join(__dirname, 'curl-pipe-bootstrap.tpl.sh');
 var BAD_SH_RE = /[<>'"`$\\]/;
 
-InstallerServer.getPosixCurlPipeBootstrap = async function ({
+Installers.getPosixCurlPipeBootstrap = async function ({ baseurl, pkg, ver }) {
-  baseurl,
-  pkg,
-  ver,
-}) {
   let bootTxt = await Fs.readFile(CURL_PIPE_SH_BOOT, 'utf8');
 
   var webiPkg = [pkg, ver].filter(Boolean).join('@');
@@ -228,8 +147,9 @@ InstallerServer.getPosixCurlPipeBootstrap = async function ({
     let name = env[0];
     let value = env[1];
 
+    // TODO create REs once, in higher scope
     let envRe = new RegExp(
-      `^[ \\t]*#?[ \\t]*(export[ \\t])?[ \\t]*(${name})=.*`,
+      `^[ \\t]*#?[ \\t]*(export\\s)?[ \\t]*(${name})=.*`,
       'm',
     );
 
@@ -245,7 +165,7 @@ InstallerServer.getPosixCurlPipeBootstrap = async function ({
   return bootTxt;
 };
 
-InstallerServer.getPwshCurlPipeBootstrap = async function ({
+Installers.getPwshCurlPipeBootstrap = async function ({
   baseurl,
   pkg,
   ver,
@@ -254,7 +174,7 @@ InstallerServer.getPwshCurlPipeBootstrap = async function ({
   let bootTxt = await Fs.readFile(CURL_PIPE_PS1_BOOT, 'utf8');
 
   var webiPkg = [pkg, ver].filter(Boolean).join('@');
-  //var webiChecksum = await InstallerServer.getWebiPs1Checksum();
+  //var webiChecksum = await Installers.getWebiPs1Checksum();
   var envReplacements = [
     ['Env:WEBI_PKG', webiPkg],
     ['Env:WEBI_HOST', baseurl],
@@ -275,6 +195,9 @@ InstallerServer.getPwshCurlPipeBootstrap = async function ({
     let tplRe = new RegExp(`{{ (${name}) }}`, 'g');
     bootTxt = bootTxt.replace(tplRe, `${value}`);
 
+    // let envRe = new RegExp(`^[ \\t]*#?[ \\t]*($$${name})[ \\t]*=.*`, 'im');
+    // bootTxt = bootTxt.replace(envRe, `$$${name} = '${value}'`);
+
     let setRe = new RegExp(
       `(#[ \\t]*)?(\\$${name})[ \\t]*=[ \\t]['"].*['"][ \\t]`,
       'im',
@@ -286,3 +209,32 @@ InstallerServer.getPwshCurlPipeBootstrap = async function ({
 
   return bootTxt;
 };
+
+var _webiShMeta = {
+  stale: 10 * 1000,
+  updated_at: 0,
+  checksum: '',
+  mtime: 0,
+};
+Installers.getWebiShChecksum = async function () {
+  let now = Date.now();
+  let ago = now - _webiShMeta.updated_at;
+  if (ago <= _webiShMeta.stale) {
+    return _webiShMeta.checksum;
+  }
+
+  let webiPath = path.join(__dirname, '../webi/webi.sh');
+  let stat = await Fs.stat(webiPath);
+  if (stat.mtimeMs === _webiShMeta.mtime) {
+    return _webiShMeta.checksum;
+  }
+
+  let webiBuf = await Fs.readFile(webiPath, null);
+  let webiHash = Crypto.createHash('sha1').update(webiBuf).digest('hex');
+  let webiChecksum = webiHash.slice(0, 8);
+
+  _webiShMeta.mtime = stat.mtimeMs;
+  _webiShMeta.updated_at = now;
+  _webiShMeta.checksum = webiChecksum;
+  return _webiShMeta.checksum;
+};

_webi/test.js

@@ -32,8 +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('./releases.js');
-var Installers = require('./installers.js');
 var ServeInstaller = require('./serve-installer.js');
 
 var pkg = process.argv[2].split('@');
@@ -65,8 +64,7 @@ console.info('Has the necessary files?');
   });
 
 console.info('');
-let projName = pkgdir.split('/').filter(Boolean).pop();
+Releases.get(path.join(process.cwd(), pkgdir)).then(async function (all) {
-Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
   var pkgname = path.basename(pkgdir.replace(/\/$/, ''));
   var nodeOs = os.platform();
   var nodeOsRelease = os.release();
@@ -83,8 +81,8 @@ Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
   var formats = ['exe', 'xz', 'tar', 'zip', 'git'];
 
   let [rel, opts] = await ServeInstaller.helper({
-    unameAgent: `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`,
+    ua: `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`,
-    projectName: pkgname,
+    pkg: pkgname,
     tag: pkgtag || '',
     formats: formats,
     libc: nodeLibc,
@@ -118,8 +116,8 @@ Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
   console.info('');
 
   return Promise.all([
-    Installers.renderBash(pkgdir, rel, opts).catch(function () {}),
+    Releases.renderBash(pkgdir, rel, opts).catch(function () {}),
-    Installers.renderPowerShell(pkgdir, rel, opts).catch(function () {}),
+    Releases.renderPowerShell(pkgdir, rel, opts).catch(function () {}),
   ]).then(function (scripts) {
     var bashTxt = scripts[0];
     var ps1Txt = scripts[1];

_webi/transform-releases.js

@@ -1,10 +1,7 @@
 'use strict';
 
-var Releases = module.exports;
-
 var path = require('path');
-var request = require('@root/request');
+var Releases = require('./releases.js');
-var _normalize = require('./normalize.js');
 
 var cache = {};
 //var staleAge = 5 * 1000;
@@ -14,21 +11,6 @@ var expiredAge = 15 * 60 * 1000;
 
 let installerDir = path.join(__dirname, '..');
 
-Releases.get = async function (pkgdir) {
-  let 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;
-  }
-
-  let all = await get(request);
-
-  return _normalize(all);
-};
-
 // TODO needs a proper test, and more accurate (though perhaps far less simple) code
 function createFormatsSorter(formats) {
   return function sortByVerExt(a, b) {
@@ -140,7 +122,7 @@ async function getCachedReleases(pkg) {
           cache[pkg].all = all;
           complete = true;
         }),
-      sleep(15000).then(function () {
+      sleep(5000).then(function () {
         if (complete) {
           return;
         }
@@ -260,7 +242,7 @@ async function filterReleases(
   return sortedRels.slice(0, limit || 1000);
 }
 
-Releases.getReleases = function ({
+module.exports = function getReleases({
   _count,
   pkg,
   ver,
@@ -296,19 +278,10 @@ Releases.getReleases = function ({
         console.error(err);
       })
       .then(function (releases) {
-        if (releases.length) {
+        if (!releases.length) {
-          return {
-            oses: all.oses,
-            arches: all.arches,
-            libcs: all.libcs,
-            formats: all.formats,
-            releases: releases,
-          };
-        }
-        if (_count < 1) {
           // Apple Silicon M1 hacky-do workaround fix
           if ('macos' === os && 'arm64' === arch) {
-            return Releases.getReleases({
+            return getReleases({
               pkg,
               ver,
               os,
@@ -322,7 +295,7 @@ Releases.getReleases = function ({
           }
           // Windows ARM hacky-do workaround fix
           if ('windows' === os && 'arm64' === arch) {
-            return Releases.getReleases({
+            return getReleases({
               pkg,
               ver,
               os,
@@ -334,42 +307,9 @@ Releases.getReleases = function ({
               limit,
             });
           }
-          // Raspberry Pi 3+ on Ubuntu arm64 (via Bionic?)
+          // Raspberry Pi 3+ on Raspbian x86 (not Ubuntu arm64)
-          if ('linux' === os && 'arm64' === arch) {
+          if (!_count && 'linux' === os && 'armv7l' === arch) {
-            return Releases.getReleases({
+            return getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'armv7l',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-          // armv7 can run armv6
-          if ('linux' === os && 'armv7l' === arch) {
-            return Releases.getReleases({
-              _count: _count + 1,
-              pkg,
-              ver,
-              os,
-              arch: 'armv6l',
-              libc,
-              lts,
-              channel,
-              formats,
-              limit,
-            });
-          }
-        }
-        if (_count < 2) {
-          // Raspberry Pi 3+ on Raspbian arm7 (not Ubuntu arm64)
-          // hail mary
-          if ('linux' === os && 'armv7l' === arch) {
-            return Releases.getReleases({
               _count: _count + 1,
               pkg,
               ver,
@@ -382,25 +322,56 @@ Releases.getReleases = function ({
               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 || '-',
+              libc: libc || '-',
+              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|-}&libc={musl|gnu|msvc|libc|static}&limit=10'",
+            },
+          ];
         }
-        releases = [
-          {
-            name: 'doesntexist.ext',
-            version: '0.0.0',
-            lts: '-',
-            channel: 'error',
-            date: '1970-01-01',
-            os: os || '-',
-            arch: arch || '-',
-            libc: libc || '-',
-            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|-}&libc={musl|gnu|msvc|libc|static}&limit=10'",
-          },
-        ];
         return {
           oses: all.oses,
           arches: all.arches,

_webi/ua-detect.js

@@ -69,7 +69,7 @@ function getArch(ua) {
     return 'arm64';
   } else if (/aarch|arm7|armv7|arm32/i.test(ua)) {
     return 'armv7l';
-  } else if (/arm6|armv6|arm(\b|_)/i.test(ua)) {
+  } else if (/arm6|armv6/i.test(ua)) {
     return 'armv6l';
   } else if (/ppc64le/i.test(ua)) {
     return 'ppc64le';

aliasman/releases.js

@@ -17,7 +17,6 @@ module.exports = function (request) {
   ];
   let oses = ['freebsd', 'linux', 'macos', 'posix'];
   return githubSource(request, owner, repo, oses, arches).then(function (all) {
-    all._names = ['aliasman', 'legacy'];
     return all;
   });
 };

arc/releases.js

@@ -6,7 +6,6 @@ var repo = 'archiver';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['archiver', 'arc'];
     return all;
   });
 };

atomicparsley/releases.js

@@ -65,7 +65,6 @@ module.exports = function (request) {
         continue;
       }
     }
-    all._names = ['AtomicParsley', 'atomicparsley'];
     return all;
   });
 };

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
+if main; then
-    exit 1
+    exit 0
 fi
-exit 0
 
 #~/.local/bin/brew-updater
 #!/bin/sh

bun/releases.js

@@ -8,17 +8,10 @@ module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     all.releases = all.releases
       .filter(function (r) {
-        let isDebug = r.name.includes('-profile');
+        let isDebug = /-profile/.test(r.name);
-        if (isDebug) {
+        if (!isDebug) {
-          return false;
+          return true;
         }
-
-        let isAncient = r.name.includes('-baseline');
-        if (isAncient) {
-          return false;
-        }
-
-        return true;
       })
       .map(function (r) {
         // bun-v0.5.1 => v0.5.1

caddy/releases.js

@@ -8,12 +8,7 @@ module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      let isOneOffAsset = rel.download.includes('buildable-artifact');
+      return !/(\.txt)|(\.deb)$/i.test(rel.name);
-      if (isOneOffAsset) {
-        return false;
-      }
-
-      return true;
     });
     return all;
   });

chromedriver/install.sh

@@ -20,28 +20,20 @@ __init_chromedriver() {
 
     # pkg_install must be defined by every package
     pkg_install() {
-        # ~/.local/opt/chromedriver-v121.0.6130.0/bin
+        # ~/.local/opt/chromedriver-v88.0.4324.96/bin
         mkdir -p "$(dirname "$pkg_src_cmd")"
 
-        # mv ./chromedriver-macos-arm64/chromedriver \
+        # mv ./chromedriver-*/chromedriver ~/.local/opt/chromedriver-v88.0.4324.96/bin/chromedriver
-        #     ~/.local/opt/chromedriver-v121.0.6130.0/bin/chromedriver
+        mv ./chromedriver* "$pkg_src_cmd"
-        mv ./chromedriver-*/chromedriver "$pkg_src_cmd"
-
-        echo ""
-        echo "    $(t_warn 'MANUAL STEPS TO FINISH:') you may need to install libnss3:"
-        echo "        $(t_cmd 'sudo apt install -y') $(t_warn 'libnss3')"
     }
 
     # pkg_get_current_version is recommended, but (soon) not required
     pkg_get_current_version() {
         # 'chromedriver --version' has output in this format:
-        #       ChromeDriver 121.0.6130.0 (5fc19c7ab5e88bb674c2efc65db4b7890a52a4ec-refs/branch-heads/6130@{#1})
+        #       ChromeDriver 88.0.4324.96 (68dba2d8a0b149a1d3afac56fa74648032bcf46b-refs/branch-heads/4324@{#1784})
         # This trims it down to just the version number:
-        #       121.0.6130.0
+        #       88.0.4324.96
-        chromedriver --version 2> /dev/null |
+        chromedriver --version 2> /dev/null | head -n 1 | cut -d ' ' -f 2
-            head -n 1 |
-            tr -s ' ' |
-            cut -d' ' -f2
     }
 
 }

chromedriver/releases.js

@@ -1,77 +1,81 @@
 'use strict';
 
-// See <https://googlechromelabs.github.io/chrome-for-testing/>
+var matchers = {
-var releaseApiUrl =
+  key: /.*Key>(.*)<\/Key.*/,
-  'https://googlechromelabs.github.io/chrome-for-testing/known-good-versions-with-downloads.json';
+  generation: /.*Generation>(.*)<\/Generation.*/,
+  metaGeneration: /.*MetaGeneration>(.*)<\/MetaGeneration.*/,
+  lastModified: /.*LastModified>(.*)<\/LastModified.*/,
+  etag: /.*ETag>(.*)<\/ETag.*/,
+  size: /.*Size>(.*)<\/Size.*/,
+};
+var baseUrl = 'https://chromedriver.storage.googleapis.com';
 
-// {
+module.exports = function (request) {
-//   "timestamp": "2023-11-15T21:08:56.730Z",
+  var all = {
-//   "versions": [
-//     {
-//       "version": "121.0.6120.0",
-//       "revision": "1222902",
-//       "downloads": {
-//         "chrome": [],
-//         "chromedriver": [
-//           {
-//             "platform": "linux64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/linux64/chromedriver-linux64.zip"
-//           },
-//           {
-//             "platform": "mac-arm64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/mac-arm64/chromedriver-mac-arm64.zip"
-//           },
-//           {
-//             "platform": "mac-x64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/mac-x64/chromedriver-mac-x64.zip"
-//           },
-//           {
-//             "platform": "win32",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/win32/chromedriver-win32.zip"
-//           },
-//           {
-//             "platform": "win64",
-//             "url": "https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/121.0.6120.0/win64/chromedriver-win64.zip"
-//           }
-//         ],
-//         "chrome-headless-shell": []
-//       }
-//     }
-//   ]
-// }
-
-module.exports = async function (request) {
-  let resp = await request({
-    url: releaseApiUrl,
-    json: true,
-  });
-
-  let builds = [];
-  for (let release of resp.body.versions) {
-    if (!release.downloads.chromedriver) {
-      continue;
-    }
-
-    let version = release.version;
-    for (let asset of release.downloads.chromedriver) {
-      let build = {
-        version: version,
-        download: asset.url,
-        // I' not sure that this is actually statically built but it
-        // seems to be and at worst we'll just get bug reports for Apline
-        libc: 'none',
-      };
-
-      builds.push(build);
-    }
-  }
-
-  let all = {
     download: '',
-    releases: builds,
+    releases: [],
   };
 
-  return all;
+  // XML
+  return request({
+    url: 'https://chromedriver.storage.googleapis.com/',
+    json: false,
+  })
+    .then(function (resp) {
+      var body = resp.body;
+      var groups = body.split(/<\/?Contents>/g);
+      // get rid of leading and trailing junk
+      groups.shift();
+      groups.pop();
+      var metas = groups.map(function (group) {
+        return {
+          key: group.replace(matchers.key, '$1'),
+          //generation: group.replace(matchers.generation, '$1'),
+          //metaGeneration: group.replace(matchers.metaGeneration, '$1'),
+          lastModified: group.replace(matchers.lastModified, '$1'),
+          //etag: group.replace(matchers.etag, '$1'),
+          //size: group.replace(matchers.size, '$1')
+        };
+      });
+      all.download = baseUrl + '/{{ download }}';
+      metas.forEach(function (asset) {
+        if (!asset.key.includes('chromedriver')) {
+          // skip the indexes, images, etc
+          return null;
+        }
+
+        var osname = asset.key.replace(/.*(win|mac|linux)/, '$1');
+        var arch;
+        if (asset.key.includes('linux')) {
+          osname = 'linux';
+        } else if (asset.key.includes('mac64')) {
+          osname = 'macos';
+          if (asset.key.includes('_m1.')) {
+            arch = 'arm64';
+          }
+        } else if (asset.key.includes('win')) {
+          osname = 'windows';
+          arch = 'amd64';
+        }
+        all.releases.push({
+          // 87.0.4280.88/chromedriver_win32.zip => 87.0.4280.88
+          version: asset.key.replace(/(.*)\/.*/, '$1'),
+          lts: false,
+          channel: 'stable',
+          date: asset.lastModified.replace(/T.*/, '$1'),
+          os: osname,
+          arch: arch,
+          hash: '-', // not sure about including etag as hash yet
+          download: asset.key,
+        });
+      });
+    })
+    .then(function () {
+      all.releases.sort(function (a, b) {
+        return new Date(b.date).valueOf() - new Date(a.date).valueOf();
+      });
+      return all;
+    });
 };
 
 if (module === require.main) {

cmake/releases.js

@@ -7,10 +7,6 @@ var repo = 'CMake';
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     for (let rel of all.releases) {
-      if (rel.version.startsWith('v')) {
-        rel._version = rel.version.slice(1);
-      }
-
       {
         let linuxRe = /(\b|_)(linux|gnu)(\b|_)/i;
         let isLinux = linuxRe.test(rel.download) || linuxRe.test(rel.name);

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"
-```

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

comrak/releases.js

@@ -4,28 +4,8 @@ var github = require('../_common/github.js');
 var owner = 'kivikakk';
 var repo = 'comrak';
 
-var ODDITIES = ['-musleabihf.1-'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    loopBuilds: for (let build of all.releases) {
-      let isOddity;
-      for (let oddity of ODDITIES) {
-        isOddity = build.name.includes(oddity);
-        if (isOddity) {
-          break;
-        }
-      }
-      if (isOddity) {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

curlie/releases.js

@@ -6,7 +6,6 @@ var repo = 'curlie';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['curlie', 'curl-httpie'];
     return all;
   });
 };

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

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 mkdir -p /mnt/EXAMPLE"
-    echo >&2 "              sudo mount /dev/sdx1 ${my_mount}"
+    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

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" \
+        "$HOME/.local/bin/dash-qt-hd"
-        "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" \
+        "$HOME/.local/bin/dash-qt-testnet"
-        "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" \
+        "$HOME/.local/bin/dashd-hd"
-        "dashd-hd"
     chmod a+x "$HOME/.local/bin/dashd-hd"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dashd-testnet" \
-        "$HOME/.local/bin/dashd-testnet" \
+        "$HOME/.local/bin/dashd-testnet"
-        "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" \
+        "$HOME/.local/bin/dashd-hd-service-install"
-        "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" \
+        "$HOME/.local/bin/dashd-testnet-service-install"
-        "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" \
+        "$HOME/.dashcore/dash.example.conf"
-        "dash.example.conf"
 
     if ! grep -q rpcuser ~/.dashcore/dash.conf; then
         cat ~/.dashcore/dash.example.conf >> ~/.dashcore/dash.conf

dashcore/releases.js

@@ -6,17 +6,14 @@ var repo = 'dash';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
+    all.releases = all.releases.filter(function (rel) {
+      return !rel.name.endsWith('.asc');
+    });
     all.releases.forEach(function (rel) {
       if (rel.name.includes('osx64')) {
         rel.os = 'macos';
       }
-
-      if (rel.version.startsWith('v')) {
-        rel._version = rel.version.slice(1);
-      }
     });
-
-    all._names = ['dashd', 'dashcore'];
     return all;
   });
 };

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/
 ```

deno/releases.js

@@ -11,12 +11,7 @@ module.exports = function (request) {
     // remove checksums and .deb
     all.releases = all.releases
       .filter(function (rel) {
-        let isMeta = rel.name.endsWith('.d.ts');
+        return !/(\.txt)|(\.deb)$/i.test(rel.name);
-        if (isMeta) {
-          return false;
-        }
-
-        return true;
       })
       .map(function (rel) {
         var ext;

duckdns.sh/releases.js

@@ -17,7 +17,6 @@ module.exports = function (request) {
   ];
   let oses = ['freebsd', 'linux', 'macos', 'posix'];
   return githubSource(request, owner, repo, oses, arches).then(function (all) {
-    all._names = ['DuckDNS.sh', 'duckdns.sh', 'legacy'];
     return all;
   });
 };

fd/releases.js

@@ -6,17 +6,6 @@ var repo = 'fd';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      if (build.name === 'fd') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

ffmpeg/releases.js

@@ -10,11 +10,6 @@ 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));
       })

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));
-  });
-}

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
+fi
-    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
 
-        read -r my_answer < /dev/tty
+if [ "Darwin" != "$(uname -s)" ]; then
-        if test -z "${my_answer}" ||
+    echo "No fish installer for Linux yet. Try this instead:"
-            test "${my_answer}" = "Y" ||
+    echo "    sudo apt install -y fish"
-            test "${my_answer}" = "y"; then
+    exit 1
-            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
 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
-    # always try to reset the default shells
+_macos_post_install
-    _macos_post_install
-fi
 
 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
+    _macos_post_install
-        # always try to reset the default shells
-        _macos_post_install
-    fi
 
     if [ ! -e ~/.config/fish/config.fish ]; then
         mkdir -p ~/.config/fish

fish/releases.js

@@ -4,19 +4,10 @@ var github = require('../_common/github.js');
 var owner = 'fish-shell';
 var repo = 'fish-shell';
 
-var ODDITIES = ['bundledpcre'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     all.releases = all.releases
       .map(function (rel) {
-        for (let oddity of ODDITIES) {
-          let isOddity = rel.name.includes(oddity);
-          if (isOddity) {
-            return;
-          }
-        }
-
         // We can extract the macos bins from the .app
         if (/\.app\.zip$/.test(rel.name)) {
           rel.os = 'macos';

flutter/releases.js

@@ -1,99 +1,59 @@
 'use strict';
 
-var FLUTTER_OSES = ['macos', 'linux', 'windows'];
+var map = {};
 
-// stable, beta, dev
+module.exports = function (request) {
-var channelMap = {};
+  var all = {
-
-// This can be spot-checked against
-// https://docs.flutter.dev/release/archive?tab=windows
-
-// The release URLs are
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_macos.json
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json
-// - https://storage.googleapis.com/flutter_infra_release/releases/releases_windows.json
-// The old release URLs are
-// - https://storage.googleapis.com/flutter_infra/releases/releases_macos.json
-// - https://storage.googleapis.com/flutter_infra/releases/releases_linux.json
-// - https://storage.googleapis.com/flutter_infra/releases/releases_windows.json
-
-// The data looks like
-// {
-//   "base_url": "https://storage.googleapis.com/flutter_infra/releases",
-//   "current_release": {
-//     "beta": "b22742018b3edf16c6cadd7b76d9db5e7f9064b5",
-//     "dev": "fa5883b78e566877613ad1ccb48dd92075cb5c23",
-//     "stable": "02c026b03cd31dd3f867e5faeb7e104cce174c5f"
-//   },
-//   "releases": [
-//     {
-//       "hash": "fa5883b78e566877613ad1ccb48dd92075cb5c23",
-//       "channel": "dev",
-//       "version": "2.3.0-16.0.pre",
-//       "release_date": "2021-05-27T23:58:47.683121Z",
-//       "archive": "dev/macos/flutter_macos_2.3.0-16.0.pre-dev.zip",
-//       "sha256": "f572b42d36714e6c58a3ed170b93bb414e2ced3ca4bde5094fbe18061cbcba6c"
-//     },
-//     {
-//       "hash": "02c026b03cd31dd3f867e5faeb7e104cce174c5f",
-//       "channel": "stable",
-//       "version": "2.2.1",
-//       "release_date": "2021-05-27T23:06:07.243882Z",
-//       "archive": "stable/macos/flutter_macos_2.2.1-stable.zip",
-//       "sha256": "6373d39ec563c337600baf42a42b258420208e4523d85479373e113d61d748df"
-//     },
-//     {
-//       "hash": "b22742018b3edf16c6cadd7b76d9db5e7f9064b5",
-//       "channel": "beta",
-//       "version": "2.2.0",
-//       "release_date": "2021-05-19T21:14:59.281482Z",
-//       "archive": "beta/macos/flutter_macos_2.2.0-beta.zip",
-//       "sha256": "31ab530e708f8d1274712211253a27a4ce7d676f139d30f2ec021df22382f052"
-//     }
-//   ]
-// }
-
-module.exports = async function (request) {
-  let all = {
     download: '',
     releases: [],
-    channels: [],
   };
-
+  return Promise.all(
-  for (let osname of FLUTTER_OSES) {
+    ['macos', 'linux', 'windows'].map(function (osname) {
-    let resp = await request({
+      return request({
-      url: `https://storage.googleapis.com/flutter_infra_release/releases/releases_${osname}.json`,
+        url:
-      json: true,
+          'https://storage.googleapis.com/flutter_infra/releases/releases_' +
-    });
+          osname +
-
+          '.json',
-    let osBaseUrl = resp.body.base_url;
+        json: true,
-    let osReleases = resp.body.releases;
+      }).then(function (resp) {
-
+        var body = resp.body;
-    for (let asset of osReleases) {
+        all.download = body.base_url + '/{{ download }}';
-      if (!channelMap[asset.channel]) {
+        body.releases.forEach(function (asset) {
-        channelMap[asset.channel] = true;
+          if (!map[asset.channel]) {
-      }
+            map[asset.channel] = true;
-
+          }
-      all.releases.push({
+          all.releases.push({
-        version: asset.version,
+            // nix leading 'v'
-        _version: `${asset.version}-${asset.channel}`,
+            version: asset.version.replace(/v/, ''),
-        lts: false,
+            lts: false,
-        channel: asset.channel,
+            channel: asset.channel,
-        date: asset.release_date.replace(/T.*/, ''),
+            date: asset.release_date.replace(/T.*/, ''),
-        //sha256: asset.sha256,
+            os: osname,
-        download: `${osBaseUrl}/${asset.archive}`,
+            arch: 'amd64',
-        _filename: asset.archive,
+            hash: '-', // not sure about including hash / sha256 yet
+            download: asset.archive,
+          });
+        });
       });
-    }
+    }),
-  }
+  ).then(function () {
-
+    all.releases.sort(function (a, b) {
-  all.channels = Object.keys(channelMap);
+      if ('stable' === a.channel && a.channel !== b.channel) {
-
+        return -1;
-  // note: versions have a waterfall relationship with channels:
+      }
-  // - a release that is in beta today may become stable tomorrow
+      if ('stable' === b.channel && a.channel !== b.channel) {
-  // - semver prereleases are either beta or dev
+        return 1;
-
+      }
-  return all;
+      if ('beta' === a.channel && a.channel !== b.channel) {
+        return -1;
+      }
+      if ('beta' === b.channel && a.channel !== b.channel) {
+        return 1;
+      }
+      return new Date(b.date).valueOf() - new Date(a.date).valueOf();
+    });
+    return all;
+  });
 };
 
 if (module === require.main) {

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

git/releases.js

@@ -12,15 +12,12 @@ module.exports = function (request) {
     all.releases = all.releases
       .filter(function (rel) {
         rel.os = 'windows';
-        rel._version = rel.version.replace(/\.windows.1.*/, '');
-        rel._version = rel._version.replace(/\.windows(\.\d)/, '$1');
         return (
           /MinGit/i.test(rel.name || rel.download) &&
           !/busybox/i.test(rel.name || rel.download)
         );
       })
       .slice(0, 20);
-    all._names = ['MinGit', 'git'];
     return all;
   });
 };

gitea/install.ps1

@@ -18,12 +18,6 @@ $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"
 
-Write-Output "Checking for Git..."
-IF (-Not (Get-Command -Name "git" -ErrorAction Silent)) {
-    & "$HOME\.local\bin\webi-pwsh.ps1" git
-    $null = Sync-EnvPath
-}
-
 # Fetch archive
 IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
     Write-Output "Downloading gitea from $Env:WEBI_PKG_URL to $pkg_download"

gitea/releases.js

@@ -4,24 +4,12 @@ var github = require('../_common/github.js');
 var owner = 'go-gitea';
 var repo = 'gitea';
 
-var ODDITIES = ['-gogit-', '-docs-'];
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      for (let oddity of ODDITIES) {
+      return !/(\.txt)|(\.deb)|(\.asc)|(\.sha256)$/i.test(rel.name);
-        let isOddity = rel.name.includes(oddity);
-        if (isOddity) {
-          return false;
-        }
-      }
-
-      return true;
     });
-
-    // "windows-4.0" as a nod to Windows NT  ¯\_(ツ)_/¯
-    all._names = ['gitea', '-4.0-'];
     return all;
   });
 };

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
 

go/releases.js

@@ -7,17 +7,6 @@ var archMap = {
   386: 'x86',
 };
 
-let ODDITIES = ['bootstrap', '-arm6.'];
-
-function isOdd(filename) {
-  for (let oddity of ODDITIES) {
-    let isOddity = filename.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 function getAllReleases(request) {
   /*
   {
@@ -44,7 +33,7 @@ function getAllReleases(request) {
     var goReleases = resp.body;
     var all = {
       releases: [],
-      download: '',
+      download: 'https://dl.google.com/go/{{ download }}',
     };
 
     goReleases.forEach((release) => {
@@ -54,21 +43,13 @@ function getAllReleases(request) {
         parts.push('0');
       }
       var version = parts.join('.');
-      // nix 'go' prefix
-      var fileversion = release.version.slice(2);
 
       release.files.forEach((asset) => {
-        let odd = isOdd(asset.filename);
-        if (odd) {
-          return;
-        }
-
         var filename = asset.filename;
         var os = osMap[asset.os] || asset.os || '-';
         var arch = archMap[asset.arch] || asset.arch || '-';
         all.releases.push({
           version: version,
-          _version: fileversion,
           // all go versions >= 1.0.0 are effectively LTS
           lts: (parts[0] > 0 && release.stable) || false,
           channel: (release.stable && 'stable') || 'beta',
@@ -77,7 +58,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,
         });
       });
     });

goreleaser/releases.js

@@ -6,7 +6,6 @@ var repo = 'goreleaser';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['goreleaser', '1'];
     return all;
   });
 };

gpg/releases.js

@@ -41,6 +41,7 @@ function transformReleases(links) {
 
   let releases = links
     .map(function (link) {
+      // strip 'go' prefix, standardize version
       let isLts = ltsRe.test(link);
       let parts = link.match(matcher);
       if (!parts || !parts[2]) {
@@ -51,12 +52,10 @@ function transformReleases(links) {
       if (segs.length > 3) {
         version += '+' + segs.slice(3);
       }
-      let fileversion = segs.join('.');
 
       return {
         name: parts[1],
         version: version,
-        _version: fileversion,
         // all go versions >= 1.0.0 are effectively LTS
         lts: isLts,
         channel: 'stable',
@@ -71,7 +70,6 @@ function transformReleases(links) {
     .filter(Boolean);
 
   return {
-    _names: ['GnuPG', 'gpgosx'],
     releases: releases,
   };
 }

hugo-extended/releases.js

@@ -13,9 +13,12 @@ module.exports = async function (request) {
       return false;
     }
 
-    let isOldAlias = rel.name.includes('Linux-64bit');
+    // remove checksums and .deb
-    if (isOldAlias) {
+    for (let ignorableExt of ['.txt', '.deb']) {
-      return false;
+      let isIgnorable = rel.name.endsWith(ignorableExt);
+      if (isIgnorable) {
+        return false;
+      }
     }
 
     return true;

hugo/releases.js

@@ -13,9 +13,12 @@ module.exports = async function (request) {
       return false;
     }
 
-    let isOldAlias = rel.name.includes('Linux-64bit');
+    // remove checksums and .deb
-    if (isOldAlias) {
+    for (let ignorableExt of ['.txt', '.deb']) {
-      return false;
+      let isIgnorable = rel.name.endsWith(ignorableExt);
+      if (isIgnorable) {
+        return false;
+      }
     }
 
     return true;

iterm2/install.sh

@@ -16,26 +16,9 @@ _install_iterm2() {
         exit 1
     fi
 
-    if test -d /Applications/iTerm.app; then
-        my_curver="$(
-            grep -A 2 CFBundleShortVersionString \
-                /Applications/iTerm.app/Contents/Info.plist |
-                tr '<> \t' '\n' |
-                grep -E '\d\.\d\.\d'
-        )"
-        if test "${my_curver}" = "${WEBI_VERSION}"; then
-            echo "    Found /Applications/iTerm.app/ (${my_curver})"
-            return 0
-        fi
-
-        echo "    Replacing /Applications/iTerm.app/ (${my_curver})"
-        mv /Applications/iTerm.app "${WEBI_TMP}/iTerm.app-webi.bak"
-    fi
-
     webi_download \
         "${WEBI_PKG_URL}" \
         "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
-
     webi_extract
 
     if [ ! -d "${WEBI_TMP}/iTerm.app" ]; then
@@ -44,9 +27,11 @@ _install_iterm2() {
         exit 1
     fi
 
+    if [ -d /Applications/iTerm.app ]; then
+        mv /Applications/iTerm.app "${WEBI_TMP}/iTerm.app-webi.bak"
+    fi
     mkdir -p /Applications/
     mv "${WEBI_TMP}/iTerm.app" /Applications/
-    echo "    Installed to /Applications/iTerm.app/"
 }
 
 _install_iterm2

iterm2/releases.js

@@ -24,24 +24,17 @@ function transformReleases(links) {
   //console.log(links.length);
 
   return {
-    _names: ['iTerm2', 'iterm2'],
     releases: links
       .map(function (link) {
+        // strip 'go' prefix, standardize version
         var channel = /\/stable\//.test(link) ? 'stable' : 'beta';
-
         var parts = link
           .replace(/.*\/iTerm2[-_]v?(\d_.*)\.zip/, '$1')
           .split('_');
         var version = parts.join('.').replace(/([_-])?beta/, '-beta');
 
-        // ex: 3.5.0-beta17 => 3_5_0beta17
-        // ex: 3.0.2-preview => 3_0_2-preview
-        let fileversion = version.replace(/\./g, '_');
-        fileversion = fileversion.replace(/-beta/g, 'beta');
-
         return {
           version: version,
-          _version: fileversion,
           // all go versions >= 1.0.0 are effectively LTS
           lts: 'stable' === channel,
           channel: channel,

jq/releases.js

@@ -4,32 +4,11 @@ var github = require('../_common/github.js');
 var owner = 'stedolan';
 var repo = 'jq';
 
-let ODDITIES = ['-no-oniguruma'];
-
-function isOdd(build) {
-  for (let oddity of ODDITIES) {
-    let isOddity = build.name.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
+    all.releases.forEach(function (rel) {
-
+      rel.version = String(rel.version).replace(/^jq\-/, '');
-    for (let build of all.releases) {
+    });
-      let odd = isOdd(build);
-      if (odd) {
-        continue;
-      }
-
-      build.version = build.version.replace(/^jq\-/, '');
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

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

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

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

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));
-  });
-}

kubectx/releases.js

@@ -4,25 +4,16 @@ var github = require('../_common/github.js');
 var owner = 'ahmetb';
 var repo = 'kubectx';
 
+/******************************************************************************/
+/** Note: Delete this Comment!                                               **/
+/**                                                                          **/
+/** Need a an example that filters out miscellaneous release files?          **/
+/**   See `deno`, `gitea`, or `caddy`                                        **/
+/**                                                                          **/
+/******************************************************************************/
+
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
-
-    for (let build of all.releases) {
-      // this installs separately
-      if (build.name.includes('kubens')) {
-        continue;
-      }
-
-      // this is the legacy bash script
-      if (build.name === 'kubectx') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

kubens/releases.js

@@ -6,23 +6,10 @@ var repo = 'kubectx';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    let builds = [];
+    // remove kubectx, etc. from kubens list
-
+    all.releases = all.releases.filter(function (rel) {
-    for (let build of all.releases) {
+      return !/(\.txt)|(kubectx)|(kubectx_)$/i.test(rel.name);
-      // this installs separately
+    });
-      if (build.name.includes('kubectx')) {
-        continue;
-      }
-
-      // this is the legacy bash script
-      if (build.name === 'kubens') {
-        continue;
-      }
-
-      builds.push(build);
-    }
-
-    all.releases = builds;
     return all;
   });
 };

macos/releases.js

@@ -41,11 +41,7 @@ var headers = {
 };
 
 module.exports = function (request) {
-  var all = {
+  var all = { download: '', releases: [] };
-    _names: ['InstallOS'],
-    download: '',
-    releases: [],
-  };
 
   return Promise.all(
     oses.map(function (os) {

node/install.sh

@@ -40,7 +40,5 @@ pkg_link() {
 }
 
 pkg_done_message() {
-    b_dst="$(fn_sub_home "${pkg_dst}")"
+    echo "Installed 'node' and 'npm' at $pkg_dst"
-    echo ""
-    echo "    Installed $(t_pkg 'node') and $(t_pkg 'npm') at $(t_path "${b_dst}/")"
 }

ollama/releases.js

@@ -7,21 +7,14 @@ var repo = 'ollama';
 module.exports = async function (request) {
   let all = await github(request, owner, repo);
 
+  // TODO why are the 0.0.x releases sorting so high?
   let releases = [];
   for (let rel of all.releases) {
-    // this is a janky, sudo-wantin' .app
+    let isLow = rel.version.startsWith('v0.0.');
-    let isJank = rel.name.startsWith('Ollama-darwin');
+    if (isLow) {
-    if (isJank) {
       continue;
     }
 
-    let isUniversal = rel.name === 'ollama-darwin';
-    if (isUniversal) {
-      let x64 = Object.assign({ arch: 'x86_64' }, rel);
-      releases.push(x64);
-
-      rel.arch = 'aarch64';
-    }
     releases.push(rel);
   }
   all.releases = releases;

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",

package.json

@@ -1,11 +1,10 @@
 {
   "name": "@webinstall/webi-installers",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.0.1",
   "description": "webinstall script repository",
   "main": "_webi/",
   "scripts": {
-    "bump": "npm version -m \"chore(release): bump to v%s\"",
     "fmt": "npm run prettier && npm run shfmt && npm run pwsh-fmt",
     "lint": "npm run shellcheck && npm run jshint && npm run pwsh-lint",
     "prepare": "npm run tooling-init && npm run git-hooks-init",

pathman/releases.js

@@ -8,14 +8,7 @@ var baseurl = 'https://git.rootprojects.org';
 module.exports = function (request) {
   return github(request, owner, repo, baseurl).then(function (all) {
     all.releases = all.releases.filter(function (release) {
-      release._filename = release.name;
+      return !/debug/.test(release.name);
-
-      let isOldAlias = release.name.includes('armv8');
-      if (isOldAlias) {
-        return false;
-      }
-
-      return true;
     });
     return all;
   });

postgres/releases.js

@@ -75,7 +75,6 @@ module.exports = async function () {
         download: '',
       },
     ].map(function (rel) {
-      rel._version = `${rel.version}-1`;
       rel.download =
         'https://get.enterprisedb.com/postgresql/' +
         rel.name +
@@ -83,7 +82,6 @@ module.exports = async function () {
       return rel;
     }),
     download: '',
-    _names: ['PostgreSQL', 'postgresql', 'Postgres', 'postgres', 'binaries'],
   };
 };
 

powershell/README.md

@@ -1,11 +1,98 @@
 ---
-title: PowerShell (pwsh alias)
+title: Microsoft PowerShell
-homepage: https://webinstall.dev/pwsh
+homepage: https://docs.microsoft.com/en-us/powershell/
 tagline: |
-  Alias for https://webinstall.dev/pwsh
+  PowerShell Core is a cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework.
-alias: pwsh
-description: |
-  See https://webinstall.dev/pwsh
 ---
 
-Alias for https://webinstall.dev/pwsh
+To update or switch versions, run `webi pwsh@stable` (or `@v7.4`, `@beta`, etc).
+
+## Cheat Sheet
+
+> The core benefit of running `pwsh` on Mac or Linux is that you get a way to
+> debug Windows scripts without having to boot up Windows.
+>
+> The core benefit of running `pwsh` on Windows is that it's years ahead of
+> pre-installed version.
+
+For example, if you want to create a `curl.exe | powershell` script for Windows
+(as we do), it's helpful to be able to do some level of debugging on other
+platforms.
+
+## Table of Contents
+
+- Files
+- ProTips
+- vim
+- lint
+- fmt
+
+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```text
+~/.config/envman/PATH.env
+~/.local/opt/pwsh/
+~/.local/share/powershell/Modules/
+~/.local/opt/pwsh/Modules/
+```
+
+### ProTip: pwsh-essentials
+
+Friends don't let friends PowerShell without
+[pwsh-essentials](../pwsh-essentials/):
+
+- [PSScriptAnalyzer](../psscriptanalyzer/)
+- [pwsh-fmt](../pwsh-essentials/)
+- [pwsh-lint](../pwsh-essentials/)
+- [pwsh-fix](../pwsh-essentials/)
+- [pwsh-run](../pwsh-essentials/)
+
+Plus, important information for anyone **Getting Started with PowerShell**:
+
+- Case-Sensitivity
+- Returns vs Pipeline Streams
+- Strict, Trace, & Verbose Modes
+- The Call Operator "&"
+- curl vs curl.exe
+- Script Policies & Preferences
+
+### How to Use PowerShell with Vim
+
+Assuming you have [vim-ale](../vim-ale/) installed - which is included with
+[vim-essentials](../vim-essentials/) - all you need to do is install the
+`PSScriptAnalyzer` module.
+
+See the "Lint & Fmt" section below.
+
+### How to Use PowerShell with VSCode
+
+_VS Code_ should also automatically recognize and use `PSScriptAnalyzer`.
+
+### How to Lint, Fmt, & Fix ps1 Files
+
+See [pwsh-essentials](../pwsh-essentials/) for more info but, in short:
+
+```sh
+pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
+```
+
+```sh
+my_ps1='./my-file.ps1'
+pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost -Path '$my_ps1'"
+```
+
+To fmt:
+
+```sh
+my_ps1='./my-file.ps1'
+my_text="$(
+    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '$my_ps1' -Raw)"
+)"
+printf '%s\n' "${my_text}" > "${my_ps1}"
+```
+
+Note: it is _several hundred times faster_ to lint and fmt from a native
+PowerShell script than from invoking `pwsh -Command` each time.

powershell/install.ps1

@@ -1,8 +1,56 @@
-#!/bin/pwsh
+#!/usr/bin/env pwsh
 
-Write-Output "'powershell@$Env:WEBI_TAG' is an alias for 'pwsh@$Env:WEBI_VERSION'"
+#################
+# Install pwsh #
+#################
 
-$PwshBootUrl = "$Env:WEBI_HOST/pwsh@$Env:WEBI_VERSION"
+# Every package should define these variables
-$PwshBootScript = "$HOME\.local\tmp\install-pwsh-boot.ps1"
+$pkg_cmd_name = "pwsh"
-Invoke-DownloadUrl -Force -URL $PwshBootUrl -Path $PwshBootScript
+
-pwsh -ExecutionPolicy Bypass $PwshBootScript
+$pkg_dst_cmd = "$HOME\.local\opt\pwsh\${pkg_cmd_name}.exe"
+$pkg_dst_bin = "$HOME\.local\opt\pwsh"
+$pkg_dst_dir = "$HOME\.local\opt\pwsh"
+$pkg_dst = "$pkg_dst_dir"
+
+$pkg_src_cmd = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION\${pkg_cmd_name}.exe"
+$pkg_src_dir = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION"
+$pkg_src = "$pkg_src_dir"
+
+New-Item "$HOME\Downloads\webi" -ItemType Directory -Force | Out-Null
+$pkg_download = "$HOME\Downloads\webi\$Env:WEBI_PKG_FILE"
+
+# Fetch archive
+Invoke-DownloadURL -URL $Env:WEBI_PKG_URL -Path $pkg_download
+
+IF (!(Test-Path -Path "$pkg_src_cmd")) {
+    Push-Location "$HOME\.local\tmp"
+
+    # Remove any leftover tmp cruft
+    Remove-Item -Path "$pkg_src_dir" -Recurse -ErrorAction Ignore | Out-Null
+    Remove-Item -Path "$HOME\.local\tmp\pwsh*" -Recurse -ErrorAction Ignore
+
+    # Unpack archive file into this temporary directory
+    # Windows BSD-tar handles zip. Imagine that.
+    New-Item ".\pwsh-v$Env:WEBI_VERSION" -ItemType Directory -Force | Out-Null
+    Push-Location ".\pwsh-v$Env:WEBI_VERSION"
+    Write-Output "    Unpacking $pkg_download"
+    & tar xf "$pkg_download"
+    Pop-Location
+
+    # Settle unpacked archive into place
+    # TODO if .\pwsh-v$Env:WEBI_VERSION\pwsh*\ exists,
+    # then the nesting of the archive has changed
+    # so move either .\pwsh-v$Env:WEBI_VERSION\pwsh*\
+    # or .\pwsh-v$Env:WEBI_VERSION\ accordingly
+    Move-Item -Path ".\pwsh-v$Env:WEBI_VERSION" -Destination "$pkg_src_dir"
+    Write-Output "    into ${TPath}${pkg_src_dir}${TReset}"
+
+    Pop-Location
+}
+
+Write-Output "    Copying ${TDim}${pkg_src}${TReset}"
+Write-Output "      into ${TPath}${pkg_dst}${TReset}"
+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" -V

powershell/install.sh

@@ -2,10 +2,45 @@
 set -e
 set -u
 
-__redirect_alias_pwsh() {
+__init_powershell() {
-    echo "'powershell@${WEBI_TAG:-stable}' is an alias for 'pwsh@${WEBI_VERSION-}'"
+
-    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
+    pkg_cmd_name="pwsh"
-    curl -fsSL "$WEBI_HOST/pwsh@${WEBI_VERSION-}" | sh
+    # no ./bin prefix
+    pkg_src_cmd="$HOME/.local/opt/pwsh-v$WEBI_VERSION/pwsh"
+    pkg_dst_cmd="$HOME/.local/opt/pwsh/pwsh"
+
+    pkg_get_current_version() {
+        # 'pwsh --version' has output in this format:
+        #       PowerShell 7.0.2
+        # This trims it down to just the version number:
+        #       7.0.2
+        pwsh --version 2> /dev/null | head -n 1 | cut -d' ' -f2
+    }
+
+    pkg_install() {
+        # mv ./* "$HOME/.local/opt/pwsh-v7.0.2"
+        mkdir -p "$pkg_src"
+        mv ./* "$pkg_src"
+
+        # symlink powershell to pwsh
+        (
+            cd "$pkg_src" > /dev/null
+            ln -s pwsh powershell
+        )
+    }
+
+    pkg_link() {
+        # rm -f "$HOME/.local/opt/pwsh"
+        rm -f "$pkg_dst"
+
+        # ln -s "$HOME/.local/opt/pwsh-v7.0.2" "$HOME/.local/opt/pwsh"
+        ln -s "$pkg_src" "$pkg_dst"
+    }
+
+    pkg_done_message() {
+        echo "Installed 'pwsh' at $pkg_dst"
+        pwsh -V
+    }
 }
 
-__redirect_alias_pwsh
+__init_powershell

powershell/releases.js

@@ -4,41 +4,17 @@ var github = require('../_common/github.js');
 var owner = 'powershell';
 var repo = 'powershell';
 
-let ODDITIES = ['-fxdependent'];
-
-function isOdd(build) {
-  for (let oddity of ODDITIES) {
-    let isOddity = build.name.includes(oddity);
-    if (isOddity) {
-      return true;
-    }
-  }
-}
-
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
     // remove checksums and .deb
     all.releases = all.releases.filter(function (rel) {
-      let odd = isOdd(rel);
-      if (odd) {
-        return false;
-      }
-
       let isPreview = rel.name.includes('-preview.');
       if (isPreview) {
         rel.channel = 'beta';
       }
 
-      let isMusl = rel.download.match(/(\b|_)(musl|alpine)(\b|_)/i);
+      return !/(alpine)|(fxdependent)|(\.deb)|(\.pkg)|(\.rpm)$/i.test(rel.name);
-      if (isMusl) {
-        // not a fully static build, not gnu-compatible
-        rel.libc = 'musl';
-      }
-
-      return true;
     });
-
-    all._names = ['PowerShell', 'powershell'];
     return all;
   });
 };

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
 }
 

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"

pwsh/README.md

@@ -1,98 +1,11 @@
 ---
-title: Microsoft PowerShell Core
+title: PowerShell (pwsh alias)
-homepage: https://docs.microsoft.com/powershell/
+homepage: https://webinstall.dev/powershell
 tagline: |
-  PowerShell Core is a cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework.
+  Alias for https://webinstall.dev/powershell
+alias: powershell
+description: |
+  See https://webinstall.dev/powershell
 ---
 
-To update or switch versions, run `webi pwsh@stable` (or `@v7.4`, `@beta`, etc).
+Alias for https://webinstall.dev/powershell
-
-## Cheat Sheet
-
-> The core benefit of running `pwsh` on Mac or Linux is that you get a way to
-> debug Windows scripts without having to boot up Windows.
->
-> The core benefit of running `pwsh` on Windows is that it's years ahead of
-> pre-installed version.
-
-For example, if you want to create a `curl.exe | powershell` script for Windows
-(as we do), it's helpful to be able to do some level of debugging on other
-platforms.
-
-## Table of Contents
-
-- Files
-- ProTips
-- vim
-- lint
-- fmt
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/opt/pwsh/
-~/.local/share/powershell/Modules/
-~/.local/opt/pwsh/Modules/
-```
-
-### ProTip: pwsh-essentials
-
-Friends don't let friends PowerShell without
-[pwsh-essentials](../pwsh-essentials/):
-
-- [PSScriptAnalyzer](../psscriptanalyzer/)
-- [pwsh-fmt](../pwsh-essentials/)
-- [pwsh-lint](../pwsh-essentials/)
-- [pwsh-fix](../pwsh-essentials/)
-- [pwsh-run](../pwsh-essentials/)
-
-Plus, important information for anyone **Getting Started with PowerShell**:
-
-- Case-Sensitivity
-- Returns vs Pipeline Streams
-- Strict, Trace, & Verbose Modes
-- The Call Operator "&"
-- curl vs curl.exe
-- Script Policies & Preferences
-
-### How to Use PowerShell with Vim
-
-Assuming you have [vim-ale](../vim-ale/) installed - which is included with
-[vim-essentials](../vim-essentials/) - all you need to do is install the
-`PSScriptAnalyzer` module.
-
-See the "Lint & Fmt" section below.
-
-### How to Use PowerShell with VSCode
-
-_VS Code_ should also automatically recognize and use `PSScriptAnalyzer`.
-
-### How to Lint, Fmt, & Fix ps1 Files
-
-See [pwsh-essentials](../pwsh-essentials/) for more info but, in short:
-
-```sh
-pwsh -Command "Install-Module -Name PSScriptAnalyzer -Scope CurrentUser -AllowClobber"
-```
-
-```sh
-my_ps1='./my-file.ps1'
-pwsh -Command "Invoke-ScriptAnalyzer -Fix -ExcludeRule PSAvoidUsingWriteHost -Path '$my_ps1'"
-```
-
-To fmt:
-
-```sh
-my_ps1='./my-file.ps1'
-my_text="$(
-    pwsh -Command "Invoke-Formatter -ScriptDefinition (Get-Content -Path '$my_ps1' -Raw)"
-)"
-printf '%s\n' "${my_text}" > "${my_ps1}"
-```
-
-Note: it is _several hundred times faster_ to lint and fmt from a native
-PowerShell script than from invoking `pwsh -Command` each time.

pwsh/install.ps1

@@ -1,57 +1,8 @@
-#!/usr/bin/env pwsh
+#!/bin/pwsh
 
-################
+Write-Output "'pwsh@$Env:WEBI_TAG' is an alias for 'powershell@$Env:WEBI_VERSION'"
-# Install pwsh #
-################
 
-# Every package should define these variables
+$PwshBootUrl = "$Env:WEBI_HOST/powershell@$Env:WEBI_VERSION"
-$pkg_cmd_name = "pwsh"
+$PwshBootScript = "$HOME\.local\tmp\install-pwsh-boot.ps1"
-
+Invoke-DownloadUrl -Force -URL $PwshBootUrl -Path $PwshBootScript
-$pkg_dst_cmd = "$HOME\.local\opt\pwsh\${pkg_cmd_name}.exe"
+powershell -ExecutionPolicy Bypass $PwshBootScript
-$pkg_dst_bin = "$HOME\.local\opt\pwsh"
-$pkg_dst_dir = "$HOME\.local\opt\pwsh"
-$pkg_dst = "$pkg_dst_dir"
-
-$pkg_src_cmd = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION\${pkg_cmd_name}.exe"
-$pkg_src_dir = "$HOME\.local\opt\pwsh-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_dir"
-
-New-Item "$HOME\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$HOME\Downloads\webi\$Env:WEBI_PKG_FILE"
-
-# Fetch archive
-Invoke-DownloadURL -URL $Env:WEBI_PKG_URL -Path $pkg_download
-
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Push-Location "$HOME\.local\tmp"
-
-    # Remove any leftover tmp cruft
-    Remove-Item -Path "$pkg_src_dir" -Recurse -ErrorAction Ignore | Out-Null
-    Remove-Item -Path "$HOME\.local\tmp\pwsh*" -Recurse -ErrorAction Ignore
-
-    # Unpack archive file into this temporary directory
-    # Windows BSD-tar handles zip. Imagine that.
-    New-Item ".\pwsh-v$Env:WEBI_VERSION" -ItemType Directory -Force | Out-Null
-    Push-Location ".\pwsh-v$Env:WEBI_VERSION"
-    Write-Output "    Unpacking $pkg_download"
-    & tar xf "$pkg_download"
-    Pop-Location
-
-    # Settle unpacked archive into place
-    # TODO if .\pwsh-v$Env:WEBI_VERSION\pwsh*\ exists,
-    # then the nesting of the archive has changed
-    # so move either .\pwsh-v$Env:WEBI_VERSION\pwsh*\
-    # or .\pwsh-v$Env:WEBI_VERSION\ accordingly
-    Move-Item -Path ".\pwsh-v$Env:WEBI_VERSION" -Destination "$pkg_src_dir"
-    Write-Output "    into ${TPath}${pkg_src_dir}${TReset}"
-
-    Pop-Location
-}
-
-Write-Output "    Copying ${TDim}${pkg_src}${TReset}"
-Write-Output "      into ${TPath}${pkg_dst}${TReset}"
-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" -V

pwsh/install.sh

@@ -2,54 +2,10 @@
 set -e
 set -u
 
-__init_pwsh() {
+__redirect_alias_powershell() {
-
+    echo "'pwsh@${WEBI_TAG:-stable}' is an alias for 'powershell@${WEBI_VERSION-}'"
-    pkg_cmd_name="pwsh"
+    WEBI_HOST=${WEBI_HOST:-"https://webinstall.dev"}
-
+    curl -fsSL "$WEBI_HOST/powershell@${WEBI_VERSION-}" | sh
-    # note: no ./bin prefix
-    pkg_src_cmd="$HOME/.local/opt/pwsh-v$WEBI_VERSION/pwsh"
-    pkg_src_dir="$HOME/.local/opt/pwsh-v$WEBI_VERSION/"
-    pkg_src="$HOME/.local/opt/pwsh-v$WEBI_VERSION/"
-
-    pkg_dst_cmd="$HOME/.local/opt/pwsh/pwsh"
-    pkg_dst_dir="$HOME/.local/opt/pwsh"
-    pkg_dst="$HOME/.local/opt/pwsh"
-
-    pkg_get_current_version() {
-        # 'pwsh --version' has output in this format:
-        #       PowerShell 7.0.2
-        # This trims it down to just the version number:
-        #       7.0.2
-        pwsh --version 2> /dev/null | head -n 1 | cut -d' ' -f2
-    }
-
-    pkg_install() {
-        # mv ./* "$HOME/.local/opt/pwsh-v7.0.2"
-        mkdir -p "$pkg_src"
-        mv ./* "$pkg_src"
-
-        # symlink pwsh as powershell
-        (
-            cd "$pkg_src" > /dev/null
-            rm -rf powershell
-            ln -s pwsh powershell
-        )
-    }
-
-    pkg_link() {
-        # rm -f "$HOME/.local/opt/pwsh"
-        rm -rf "$pkg_dst"
-
-        # ln -s "$HOME/.local/opt/pwsh-v7.0.2" "$HOME/.local/opt/pwsh"
-        ln -s "$pkg_src" "$pkg_dst"
-    }
-
-    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
-    }
 }
 
-__init_pwsh
+__redirect_alias_powershell

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 \
+sudo apt install -y build-essential zlib1g-dev libssl-dev
-                    libreadline-dev liblzma-dev
 
 # recommended
-sudo apt install -y libsqlite3-dev libffi-dev libbz2-dev
+sudo apt install -y libreadline-dev libsqlite3-dev \
-```
+                    libffi-dev libbz2-dev liblzma-dev
-
-### How to Install pyenv on Alpine
-
-```sh
-sudo apk add \
-    bash \
-    build-base \
-    git \
-    zlib-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

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

rg/releases.js

@@ -6,7 +6,6 @@ var repo = 'ripgrep';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['ripgrep', 'rg'];
     return all;
   });
 };

sass/releases.js

@@ -6,7 +6,6 @@ var repo = 'dart-sass';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['dart-sass', 'sass'];
     return all;
   });
 };

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
 }

sd/install.sh

@@ -20,22 +20,10 @@ __init_sd() {
 
     # pkg_install must be defined by every package
     pkg_install() {
+        # ~/.local/opt/sd-v0.99.9/bin
+        mkdir -p "$(dirname "$pkg_src_cmd")"
         # mv ./sd-*/sd "$pkg_src_cmd"
-        if test -f sd-*; then
+        mv sd-* "$pkg_src_cmd"
-            # ~/.local/opt/sd-v0.99.9/bin
-            mkdir -p "$(dirname "$pkg_src_cmd")"
-            mv sd-* "$pkg_src_cmd"
-        elif test -f sd-*/sd; then
-            # ~/.local/opt/sd-v0.99.9/bin
-            mkdir -p "$(dirname "$pkg_src_cmd")"
-            mv sd-*/sd "$pkg_src_cmd"
-            if test -f sd-*/sd.1; then
-                mkdir -p "$pkg_src_dir/share/man/man1"
-                mv sd-*/sd.1 "$pkg_src_dir/share/man/man1"
-            fi
-        elif test -d sd-*/bin; then
-            mv sd-* "$pkg_src_dir"
-        fi
     }
 
     # pkg_get_current_version is recommended, but (soon) not required

shellcheck/releases.js

@@ -6,6 +6,27 @@ var repo = 'shellcheck';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
+    all.releases = all.releases.filter(function (rel) {
+      // don't include meta versions as actual versions
+      if (
+        ['latest', 'stable'].includes(rel.version) ||
+        'v' !== rel.version[0]
+      ) {
+        return false;
+      }
+      return true;
+    });
+
+    all.releases.forEach(function (rel) {
+      // if there is no os or arch or source designation, and it's a .zip, it's Windows amd64
+      if (
+        !/(darwin|mac|linux|x86_64|arm|src|source)/i.test(rel.name) &&
+        /\.zip$/.test(rel.name)
+      ) {
+        rel.os = 'windows';
+        rel.arch = 'amd64';
+      }
+    });
     return all;
   });
 };

sqlpkg/releases.js

@@ -6,7 +6,6 @@ var repo = 'sqlpkg-cli';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['sqlpkg-cli', 'sqlpkg'];
     return all;
   });
 };

ssh-adduser/ssh-adduser

@@ -61,7 +61,7 @@ main() {
     sudo -i -u "$my_new_user" sh -c "curl -fsSL '$WEBI_HOST/ssh-pubkey' | sh > /dev/null" ||
         sudo -i -u "$my_new_user" sh -c "wget -q -O - '$WEBI_HOST/ssh-pubkey' | sh > /dev/null"
 
-    if test -z "${SSH_ADDUSER_AUTO:-}"; then
+    if test -z "${SSH_ADDUSER_AUTO}"; then
         echo ""
         echo "!! BREAKING CHANGE !!"
         echo ""

ssh-authorize/ssh-authorize.ps1

@@ -166,7 +166,7 @@ function Add-AuthorizedKey($UrlOrPath) {
 
     $TmpKeys = "new_authorized_keys.tmp.txt"
 
-    curl.exe -f -sS $UrlOrPath | Out-File -Force "${TmpKeys}.partial"
+    curl.exe --fail-with-body -sS $UrlOrPath | Out-File -Force "${TmpKeys}.partial"
     $null = Move-Item -Force "${TmpKeys}.partial" $TmpKeys
 
     IF ($IsHttp) {

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
+    if [ ! -d "$HOME/.ssh" ]; then
-        mkdir -p ~/.ssh/
+        mkdir -p "$HOME/.ssh/"
-        chmod 0700 ~/.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
+        touch "$HOME/.ssh/config"
-        chmod 0644 ~/.ssh/config
+        chmod 0644 "$HOME/.ssh/config"
     fi
 
-    if ! test -f ~/.ssh/authorized_keys; then
+    if [ ! -f "$HOME/.ssh/authorized_keys" ]; then
-        touch ~/.ssh/authorized_keys
+        touch "$HOME/.ssh/authorized_keys"
-        chmod 0600 ~/.ssh/authorized_keys
+        chmod 0600 "$HOME/.ssh/authorized_keys"
     fi
 
-    my_keytype=''
+    if [ ! -f "$HOME/.ssh/id_rsa" ]; then
-    if test -f ~/.ssh/id_ed25519; then
+        ssh-keygen -b 2048 -t rsa -f "$HOME/.ssh/id_rsa" -q -N ""
-        my_keytype='ed25519'
+        echo >&2 ""
-        if ! test -f ~/.ssh/id_ed25519.pub; then
+    fi
-            echo >&2 ""
+
-            ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub
+    if [ ! -f "$HOME/.ssh/id_rsa.pub" ]; then
-        fi
+        ssh-keygen -y -f "$HOME/.ssh/id_rsa" > "$HOME/.ssh/id_rsa.pub"
-    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'
         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"
+    rm -f "$HOME/Downloads/id_rsa.$(whoami).pub"
-    cp -RPp "$HOME/.ssh/id_${my_keytype}.pub" "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
+    cp -r "$HOME/.ssh/id_rsa.pub" "$HOME/Downloads/id_rsa.$(whoami).pub"
-    cat "$HOME/Downloads/id_${my_keytype}.$(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

terraform/releases.js

@@ -1,5 +1,15 @@
 'use strict';
 
+let convert = {
+  freebsd: 'freebsd',
+  macos: 'darwin',
+  linux: 'linux',
+  windows: 'windows',
+  amd64: 'amd64',
+  arm: 'arm64',
+  386: 'x86',
+};
+
 function getAllReleases(request) {
   return request({
     url: 'https://releases.hashicorp.com/terraform/index.json',
@@ -16,11 +26,9 @@ function getAllReleases(request) {
         let r = {
           version: build.version,
           download: build.url,
-          // These are generic enough for the autodetect,
+          os: convert[build.os],
-          // and the per-file logic has proven to get outdated sooner
+          arch: convert[build.arch],
-          //os: convert[build.os],
+          channel: 'stable', // No other channels
-          //arch: convert[build.arch],
-          //channel: 'stable|-rc|-beta|-alpha',
         };
         all.releases.push(r);
       });

trip/releases.js

@@ -6,7 +6,6 @@ var repo = 'trippy';
 
 module.exports = function (request) {
   return github(request, owner, repo).then(function (all) {
-    all._names = ['trippy', 'trip'];
     return all;
   });
 };