chore: update deps

.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:
-          GITHUB_TOKEN: ${{ github.token }}
-        run: npm run test
+      - run: npm run test

README.md

@@ -98,10 +98,9 @@ You just fill in the blanks.
 Just create an empty directory and run the tests until you get a good result.
 
 ```sh
-git clone git@github.com:webinstall/webi-installers.git
-pushd ./webi-installers/
-git submodule update --init
-npm clean-install
+git clone git@github.com:webinstall/packages.git
+pushd packages
+npm install
 ```
 
 ```sh

_common/gitea.js

@@ -1,46 +1,35 @@
 'use strict';
 
-var GitHubish = require('./githubish.js');
+var ghRelease = require('./github.js');
 
 /**
- * Lists Gitea Releases (w/ uploaded assets)
+ * Gets the releases for 'ripgrep'. This function could be trimmed down and made
+ * for use with any github release.
  *
- * @param {any} _request - deprecated
- * @param {String} owner
- * @param {String} repo
- * @param {String} baseurl
- * @param {String} [username]
- * @param {String} [token]
+ * @param request
+ * @param {string} owner
+ * @param {string} repo
+ * @returns {PromiseLike<any> | Promise<any>}
  */
-async function getAllReleases(
-  _request,
-  owner,
-  repo,
-  baseurl,
-  username = '',
-  token = '',
-) {
-  baseurl = `${baseurl}/api/v1`;
-  let all = await GitHubish.getAllReleases({
-    owner,
-    repo,
-    baseurl,
-    username,
-    token,
-  });
-  return all;
+function getAllReleases(request, owner, repo, baseurl) {
+  if (!baseurl) {
+    return Promise.reject('missing baseurl');
+  }
+  return ghRelease(request, owner, repo, baseurl + '/api/v1').then(
+    function (all) {
+      return all;
+    },
+  );
 }
 
 module.exports = getAllReleases;
 
 if (module === require.main) {
   getAllReleases(
-    null,
-    'root',
-    'pathman',
-    'https://git.rootprojects.org',
-    '',
-    '',
+    require('@root/request'),
+    'coolaj86',
+    'go-pathman',
+    'https://git.coolaj86.com',
   ).then(
     //getAllReleases(require('@root/request'), 'root', 'serviceman', 'https://git.rootprojects.org').then(
     function (all) {

_common/github.js

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

_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, {
-      Authorization: `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));
-  });
-}

_example/README.md

@@ -23,7 +23,7 @@ install:
 ```text
 ~/.config/envman/PATH.env
 ~/.local/bin/foo
-~/.local/opt/foo/
+~/.local/opt/foo
 ```
 
 ## Cheat Sheet

_example/releases.js

@@ -12,19 +12,17 @@ var repo = 'ripgrep';
 /**                                                                          **/
 /******************************************************************************/
 
-module.exports = async function (request) {
-  let all = await github(request, owner, repo);
-  return all;
+module.exports = function (request) {
+  return github(request, owner, repo).then(function (all) {
+    return all;
+  });
 };
 
 if (module === require.main) {
-  (async function () {
-    let request = require('@root/request');
-    let normalize = require('../_webi/normalize.js');
-    let all = await module.exports(request);
-    all = normalize(all);
+  module.exports(require('@root/request')).then(function (all) {
+    all = require('../_webi/normalize.js')(all);
     // just select the first 5 for demonstration
     all.releases = all.releases.slice(0, 5);
     console.info(JSON.stringify(all, null, 2));
-  })();
+  });
 }

_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.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/classify-one.js

@@ -1,92 +0,0 @@
-'use strict';
-
-let Path = require('node:path');
-
-// let Builds = require('./builds.js');
-let BuildsCacher = require('./builds-cacher.js');
-let Triplet = require('./build-classifier/triplet.js');
-
-let request = require('@root/request');
-
-async function main() {
-  let projName = process.argv[2];
-  if (!projName) {
-    console.error(``);
-    console.error(`USAGE`);
-    console.error(``);
-    console.error(`    classify-one <project-name>`);
-    console.error(``);
-    console.error(`EXAMPLE`);
-    console.error(``);
-    console.error(`    classify-one caddy`);
-    console.error(``);
-    return;
-  }
-
-  let tsDate = new Date(0);
-  let meta = {
-    // version info
-    versions: [],
-    lexvers: [],
-    lexversMap: {},
-    // culled release assets
-    packages: [],
-    releasesByTriplet: {},
-    // target info
-    triplets: [],
-    oses: [],
-    arches: [],
-    libcs: [],
-    formats: [],
-    // TODO channels: [],
-  };
-
-  let installersDir = Path.join(__dirname, '..');
-  let Releases = require(`${installersDir}/${projName}/releases.js`);
-  if (!Releases.latest) {
-    Releases.latest = Releases;
-  }
-
-  let projInfo = await Releases.latest(request);
-
-  // let packages = await Builds.getPackage({ name: projName });
-  // console.log(packages);
-
-  let bc = {};
-  bc.ALL_TERMS = Triplet.TERMS_PRIMARY_MAP;
-  bc.orphanTerms = Object.assign({}, bc.ALL_TERMS);
-  bc.unknownTerms = {};
-  bc.usedTerms = {};
-  bc.formats = [];
-  bc._targetsByBuildIdCache = {};
-  bc._triplets = {};
-
-  let transformed = BuildsCacher.transformAndUpdate(
-    projName,
-    projInfo,
-    meta,
-    tsDate,
-    bc,
-  );
-
-  console.log(`[DEBUG] transformed`);
-  let sample = transformed.packages.slice(0, 20);
-  console.log('packages:', sample, ':packages');
-  console.log(
-    'releasesByTriplet:',
-    transformed.releasesByTriplet['linux-x86_64-none'][transformed.versions[0]],
-    ':releasesByTriplet',
-  );
-  console.log('versions:', transformed.versions, ':versions');
-  console.log('triplets:', transformed.triplets, ':triplets');
-  console.log('oses:', transformed.oses, ':oses');
-  console.log('arches:', transformed.arches, ':arches');
-  console.log('libcs:', transformed.libcs, ':libcs');
-  console.log('formats:', transformed.formats, ':formats');
-  console.log(Object.keys(transformed));
-}
-
-main().catch(function (err) {
-  console.error('Error:');
-  console.error(err);
-});

_webi/curl-pipe-bootstrap.tpl.sh

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

_webi/installers.js

@@ -16,7 +16,7 @@ var BAD_SH_RE = /[<>'"`$\\]/;
 Installers.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 = [];
@@ -93,17 +93,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_ARCHES', (rel.arches || []).join(' ')],
-    ['PKG_LIBCS', (rel.libcs || []).join(' ')],
-    ['PKG_FORMATS', (rel.formats || []).join(' ')],
-    ['PKG_LATEST', latest],
+    ['PKG_OSES', rel.oses],
+    ['PKG_ARCHES', rel.arches],
+    ['PKG_LIBCS', rel.libcs],
+    ['PKG_FORMATS', (rel.formats || []).join(',')],
   ];
 
   for (let env of envReplacements) {

_webi/lint-builds.js

@@ -124,20 +124,184 @@ let bc = BuildsCacher.create({
   installers: INSTALLERS_DIR,
 });
 
+async function getPackagesWithBuilds(installersDir, pkgNames, parallel = 25) {
+  let packages = [];
+
+  await Parallel.run(parallel, pkgNames, getAll);
+
+  async function getAll(name, i) {
+    let Releases = require(`${installersDir}/${name}/releases.js`);
+    let pkg = await bc.getBuilds({
+      Releases: Releases,
+      name: name,
+      date: new Date(),
+    });
+    packages[i] = pkg;
+  }
+
+  return packages;
+}
+
+function getBuildsByTarget(packages) {
+  let packagesByName = {};
+
+  for (let pkg of packages) {
+    let buildsByOs = getBuildsByOs(pkg);
+    packagesByName[pkg.name] = buildsByOs;
+  }
+
+  return packagesByName;
+}
+
+function getBuildsByOs(pkg) {
+  let buildsByOs = {};
+
+  for (let build of pkg.releases) {
+    // TODO check targets cache
+    let target = bc.classify(pkg, build);
+    if (!target) {
+      // ignore known, non-package extensions
+      continue;
+    }
+
+    if (target.error) {
+      let err = target.error;
+      let code = err.code || '';
+      console.error(`[ERROR]: ${code} ${pkg.name}: ${build.name}`);
+      console.error(`>>> ${err.message} <<<`);
+      console.error(pkg);
+      console.error(build);
+      console.error(`^^^ ${err.message} ^^^`);
+      console.error(err.stack);
+      continue;
+    }
+
+    let buildsByRelease = getBuildsByRelease(build, buildsByOs, target);
+    buildsByRelease.push(build);
+  }
+
+  return buildsByOs;
+}
+
+function getBuildsByRelease(build, buildsByOs, target) {
+  let archLibc = `${target.arch}-${target.libc}`;
+
+  if (!buildsByOs[target.os]) {
+    buildsByOs[target.os] = {};
+  }
+
+  let buildsByVersion = buildsByOs[target.os];
+  if (!buildsByVersion[build.version]) {
+    buildsByVersion[build.version] = {};
+  }
+
+  let buildsByArchLibc = buildsByVersion[build.version];
+  if (!buildsByArchLibc[archLibc]) {
+    buildsByArchLibc[archLibc] = [];
+  }
+
+  let buildsByRelease = buildsByArchLibc[archLibc];
+  return buildsByRelease;
+}
+
+function matchBuildsByTarget(pkg, buildsTree, target) {
+  let oses = [];
+  let targetOs = target.os;
+  if (target.os === 'windows') {
+    oses = ['ANYOS', 'windows'];
+    //buildsByOs = buildsTree.ANYOS || buildsTree[target.os];
+  } else if (target.os === 'android') {
+    oses = ['ANYOS', 'posix_2017', 'android', 'linux'];
+    // buildsByOs =
+    //   buildsTree.ANYOS || buildsTree.posix_2017 || buildsTree[target.os];
+    // if (!buildsByOs) {
+    //   targetOs = 'linux';
+    //   buildsByOs = buildsTree.linux;
+    // }
+  } else {
+    oses = ['ANYOS', 'posix_2017', target.os];
+    // buildsByOs =
+    //   buildsTree.ANYOS || buildsTree.posix_2017 || buildsTree[target.os];
+  }
+
+  // TODO can we move sortByOsAndArchLibc(builds, anything) down to the lib?
+  //     and then the matcher
+  //     and make the waterfall more optional?
+
+  let waterfall = HostTargets.WATERFALL[target.os] || {};
+  let arches = waterfall[target.arch] ||
+    HostTargets.WATERFALL.ANYOS[target.arch] || [target.arch];
+  arches = ['ANYARCH'].concat(arches);
+  let libcs = waterfall[target.libc] ||
+    HostTargets.WATERFALL.ANYOS[target.libc] || [target.libc];
+
+  //console.log('waterfalls', arches, libcs);
+
+  // TODO flatten earlier and precache?
+  let duplets = [];
+  for (let arch of arches) {
+    for (let libc of libcs) {
+      let duplet = `${arch}-${libc}`;
+      duplets.push(duplet);
+    }
+  }
+
+  let duplet;
+  let targetBuilds;
+  for (let os of oses) {
+    let buildsByOs = buildsTree[os];
+    if (!buildsByOs) {
+      continue;
+    }
+
+    // TODO
+    //   - latest supported triplets
+    //   - historical supported triplets
+
+    // TODO sort versions first, get channel (or 'stable' or 'latest') from user
+    for (let version of pkg.versions) {
+      let versionBuilds = buildsByOs[version];
+      if (!versionBuilds) {
+        continue;
+      }
+
+      for (let _duplet of duplets) {
+        targetBuilds = versionBuilds[_duplet];
+        //console.log(`    duplet: ${_duplet}`, versionBuilds, targetBuilds);
+        if (targetBuilds?.length > 0) {
+          targetOs = os;
+          duplet = _duplet;
+          break;
+        }
+      }
+      if (targetBuilds?.length > 0) {
+        break;
+      }
+    }
+    if (targetBuilds?.length > 0) {
+      break;
+    }
+  }
+
+  if (!targetBuilds?.length) {
+    // console.log('    no builds:', buildsByOs);
+    targetBuilds = [];
+  }
+
+  let match = { triplet: `${targetOs}-${duplet}`, builds: targetBuilds };
+  return match;
+}
+
 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 [pkgName, userAgent] = process.argv[2].slice(0);
+  // create test case for zoxide, caddy, rg
 
-  let dirs = await bc.getProjectsByType();
-  if (!projName) {
-    showDirs(dirs);
-    console.info('');
-  }
+  let dirs = await bc.getPackages();
+  showDirs(dirs);
+  console.info('');
 
   bc.freshenRandomPackage(600 * 1000);
 
@@ -145,106 +309,86 @@ async function main() {
   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];
+  let index = valids.indexOf('webi');
+  if (index >= 0) {
+    // TODO fix the webi faux package
+    // (not sure why I even created it)
+    void valids.splice(index, 1);
   }
+
+  let parallel = 25;
   //valids = ['atomicparsley', 'caddy', 'macos'];
   //valids = ['atomicparsley'];
+  let packages = await getPackagesWithBuilds(INSTALLERS_DIR, valids, parallel);
 
-  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(`Fetching builds for`);
+  for (let pkg of packages) {
+    console.info(`    ${pkg.name}`);
 
-  console.info(`Classifying build assets for...`);
-  for (let projInfo of projects) {
-    console.info(`    ${projInfo.name}`);
-
-    let nStr = projInfo.releases.length.toString();
+    let nStr = pkg.releases.length.toString();
     let n = nStr.padStart(5, ' ');
-    let row = `##### ${n}\t${projInfo.name}\tv`;
+    let row = `##### ${n}\t${pkg.name}\tv`;
     rows.push(row);
 
     // ignore known, non-package extensions
-    for (let build of projInfo.releases) {
-      let target = bc.classify(projInfo, build);
+    for (let build of pkg.releases) {
+      let target = bc.classify(pkg, 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(pkg);
           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}`);
+      rows.push(`${target.triplet}\t${pkg.name}\t${build.version}`);
     }
   }
 
-  console.info(`Fetching builds for`);
-  for (let projInfo of projects) {
-    console.info('');
-    console.info('');
-    console.info(`    ${projInfo.name}`);
+  let packagesTree = getBuildsByTarget(packages);
+  //console.log(`packagesTree`, packagesTree);
 
+  for (let pkg of packages) {
+    console.log('');
+    console.log('');
+    console.log('pkg', pkg.name);
+    let buildsTree = packagesTree[pkg.name];
+    console.log(buildsTree);
     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: '',
-      });
+      console.log('');
+      console.log(`target: ${hostTriplet}`);
+      let match = matchBuildsByTarget(pkg, buildsTree, target);
       if (!match) {
-        console.info(
-          `    project: ${projInfo.name}: missing build for os '${target.os}'`,
+        console.log(
+          `    pkg: ${pkg.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}'`,
+      if (match.builds.length === 0) {
+        console.log(
+          `    pkg: ${pkg.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}`);
+        console.log(`    selected ${match.builds.length}`);
       } else {
-        let releaseNames = Object.keys(match.releases);
-        console.info(
-          `    selected ${releaseNames.length} (${match.triplet} fallback)`,
+        console.log(
+          `    selected ${match.builds.length} (${match.triplet} fallback)`,
         );
       }
     }
@@ -286,18 +430,6 @@ async function main() {
   }
 
   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
 }

_webi/package-install.tpl.sh

@@ -127,7 +127,6 @@ __bootstrap_webi() {
             echo ""
             echo "    $(t_err "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 ""
-            echo "        Latest Version: ${PKG_LATEST}"
             echo "        CPUs: $PKG_ARCHES"
             echo "        OSes: $PKG_OSES"
             echo "        libcs: $PKG_LIBCS"
@@ -197,32 +196,20 @@ __bootstrap_webi() {
         my_dl_rel="$(
             fn_sub_home "${WEBI_PKG_PATH}/${WEBI_PKG_FILE}"
         )"
-        if test "$WEBI_EXT" = "tar.zst"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            unzstd -c --keep "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" | tar xf -
-        elif test "$WEBI_EXT" = "tar.xz"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            unxz -c -k "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" | tar xf -
-        elif test "$WEBI_EXT" = "tar.gz"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            tar xzf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "tar.bz2"; then
-            echo "    Extracting $(t_path "${my_dl_rel}")"
-            tar xjf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "tar"; then
+        if [ "tar" = "$WEBI_EXT" ]; then
             echo "    Extracting $(t_path "${my_dl_rel}")"
             tar xf "${WEBI_PKG_PATH}/$WEBI_PKG_FILE"
-        elif test "$WEBI_EXT" = "zip" || test "$WEBI_EXT" = "app.zip"; then
+        elif [ "zip" = "$WEBI_EXT" ]; then
             echo "    Extracting $(t_path "${my_dl_rel}")"
             unzip "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > __unzip__.log
-        elif test "$WEBI_EXT" = "exe"; then
+        elif [ "exe" = "$WEBI_EXT" ]; then
             echo "    Moving $(t_path "${my_dl_rel}")"
             echo "      to $(t_path "$(fn_sub_home "$(pwd)")")"
             mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif test "$WEBI_EXT" = "git"; then
+        elif [ "git" = "$WEBI_EXT" ]; then
             echo "    Moving $(t_path "${my_dl_rel}")"
             mv "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" .
-        elif test "$WEBI_EXT" = "xz"; then
+        elif [ "xz" = "$WEBI_EXT" ]; then
             echo "    Inflating $(t_path "${my_dl_rel}")"
             unxz -c "${WEBI_PKG_PATH}/$WEBI_PKG_FILE" > "$(basename "$WEBI_PKG_FILE")"
         else
@@ -235,6 +222,8 @@ __bootstrap_webi() {
     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)
@@ -397,6 +386,7 @@ __bootstrap_webi() {
     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
@@ -405,7 +395,6 @@ __bootstrap_webi() {
         echo "    Creating$(t_path ' ~/.local/bin')"
         mkdir -p "$HOME/.local/bin"
     fi
-    fn_envman_init
 
     ##
     ##
@@ -786,23 +775,12 @@ webi_upgrade() { (
 fn_checksum() {
     a_filepath="${1}"
 
-    if command -v sha1sum > /dev/null; then
-        sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
-    fi
-
+    cmd_shasum='sha1sum'
     if command -v shasum > /dev/null; then
-        shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-        return 0
+        cmd_shasum='shasum'
     fi
 
-    if command -v sha1 > /dev/null; then
-        sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-        return 0
-    fi
-
-    echo >&2 "    warn: no sha1 sum program"
-    date '+%F %H:%M'
+    $cmd_shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
 }
 
 ##############################################

_webi/serve-installer.js

@@ -2,14 +2,17 @@
 
 var InstallerServer = module.exports;
 
-let Fs = require('fs/promises');
-let Path = require('path');
+var Fs = require('fs/promises');
+var path = require('path');
 
-let HostTargets = require('./build-classifier/host-targets.js');
-let Builds = require('./builds.js');
-let Installers = require('./installers.js');
+var uaDetect = require('./ua-detect.js');
+var Projects = require('./projects.js');
+var Installers = require('./installers.js');
 
-InstallerServer.INSTALLERS_DIR = Path.join(__dirname, '..');
+// handlers caching and transformation, probably should be broken down
+var Releases = require('./transform-releases.js');
+
+InstallerServer.INSTALLERS_DIR = path.join(__dirname, '..');
 InstallerServer.serveInstaller = async function (
   baseurl,
   ua,
@@ -19,194 +22,113 @@ InstallerServer.serveInstaller = async function (
   formats,
   libc,
 ) {
-  let unameAgent = ua;
-  let projectName = pkg;
-  let [rel, tmplParams] = await InstallerServer.helper({
-    unameAgent,
-    projectName,
+  let [rel, opts] = await InstallerServer.helper({
+    ua,
+    pkg,
     tag,
     formats,
     libc,
   });
-  Object.assign(tmplParams, {
+  Object.assign(opts, {
     baseurl,
   });
 
-  var pkgdir = Path.join(InstallerServer.INSTALLERS_DIR, projectName);
+  var pkgdir = path.join(InstallerServer.INSTALLERS_DIR, pkg);
   if ('ps1' === ext) {
-    return Installers.renderPowerShell(pkgdir, rel, tmplParams);
+    return Installers.renderPowerShell(pkgdir, rel, opts);
   }
-  return Installers.renderBash(pkgdir, rel, tmplParams);
+  return Installers.renderBash(pkgdir, rel, opts);
 };
+InstallerServer.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
-InstallerServer.helper = async function ({
-  unameAgent,
-  projectName,
-  tag,
-  formats,
-  libc,
-}) {
-  console.log(`dbg: Installer User-Agent: ${unameAgent}`);
+  // TODO maybe move package/version/lts/channel detection into getReleases
+  var ver = tag.replace(/^v/, '');
+  var lts;
+  var channel;
 
-  let releaseTarget = toReleaseTarget(tag);
-  let hostFormats = formats;
-  let terms = unameAgent.split(/[\s\/]+/g);
-  let hostTarget = {};
-  try {
-    void HostTargets.termsToTarget(hostTarget, terms);
-  } catch (e) {
-    // if we can't guarantee the results...
-    // "in the face of ambiguity, refuse the temptation to guess"
-    throw e;
-  }
-  console.log(`dbg: Installer Host Target:`);
-  console.log(hostTarget);
-
-  if (!hostTarget.os) {
-    throw new Error(`OS could not be identified by User-Agent '${unameAgent}'`);
+  switch (ver) {
+    case 'latest':
+      ver = '';
+      channel = 'stable';
+      break;
+    case 'lts':
+      lts = true;
+      channel = 'stable';
+      ver = '';
+      break;
+    case 'stable':
+      channel = 'stable';
+      ver = '';
+      break;
+    case 'beta':
+      channel = 'beta';
+      ver = '';
+      break;
+    case 'dev':
+      channel = 'dev';
+      ver = '';
+      break;
   }
 
-  console.log(`dbg: Get Project Installer Type for '${projectName}':`);
-  let proj = await Builds.getProjectType(projectName);
-  console.log(proj);
-
-  let validTypes = ['alias', 'selfhosted', 'valid'];
-  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;
+  var myOs = uaDetect.os(ua);
+  var myArch = uaDetect.arch(ua);
+  var myLibc;
+  if (libc) {
+    myLibc = uaDetect.libc(libc);
   }
-  if (proj.type === 'alias') {
-    projectName = proj.detail;
+  if (!myLibc) {
+    myLibc = uaDetect.libc(ua);
+  }
+  if (!myLibc) {
+    myLibc = 'libc';
   }
 
-  let tmplParams = {
-    pkg: projectName,
-    tag: tag,
-    os: hostTarget.os,
-    arch: hostTarget.arch,
-    libc: hostTarget.libc,
-    formats: hostFormats,
+  let cfg = await Projects.get(pkg);
+  let releaseQuery = {
+    pkg: cfg.alias || pkg,
+    ver,
+    os: myOs,
+    arch: myArch,
+    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 = {
-    name: 'doesntexist.ext',
-    version: '0.0.0',
-    lts: '-',
-    channel: 'error',
-    date: '1970-01-01',
-    os: hostTarget.os || '-',
-    arch: hostTarget.arch || '-',
-    libc: hostTarget.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'",
+  let rels = await Releases.getReleases(releaseQuery);
+
+  var rel = rels.releases[0];
+  var opts = {
+    pkg: cfg.alias || pkg,
+    ver,
+    tag,
+    os: myOs,
+    arch: myArch,
+    libc: myLibc,
+    lts,
+    channel,
+    formats,
+    limit: 1,
   };
-
-  if (proj.type === 'selfhosted') {
-    return [errPackage, tmplParams];
-  }
-
-  let projInfo = await Builds.getPackage({
-    name: projectName,
-    date: new Date(),
-  });
-  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,
+  rel = Object.assign(
+    {
+      oses: rels.oses,
+      arches: rels.arches,
+      libcs: rels.libcs,
+      formats: rels.formats,
+    },
+    rel,
   );
-  // { triplet: `${os}-${arch}-${libc}`, packages: targetPackages
-  // , latest: projInfo.versions[0], versions: matchInfo
-  // }
 
-  if (!targetRelease?.packages) {
-    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];
+  return [rel, opts];
 };
 
-let channelNames = [
-  'stable',
-  // '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 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 ({
@@ -228,6 +150,7 @@ 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})=.*`,
       'm',
@@ -275,6 +198,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',

_webi/test.js

@@ -32,7 +32,7 @@ if (/\b-?-h(elp)?\b/.test(process.argv.join(' '))) {
 var os = require('os');
 var fs = require('fs');
 var path = require('path');
-var Builds = require('./builds.js');
+var Releases = require('./transform-releases.js');
 var Installers = require('./installers.js');
 var ServeInstaller = require('./serve-installer.js');
 
@@ -65,8 +65,7 @@ console.info('Has the necessary files?');
   });
 
 console.info('');
-let projName = pkgdir.split('/').filter(Boolean).pop();
-Builds.getPackage({ name: projName }).then(async function (/*projInfo*/) {
+Releases.get(path.join(process.cwd(), pkgdir)).then(async function (all) {
   var pkgname = path.basename(pkgdir.replace(/\/$/, ''));
   var nodeOs = os.platform();
   var nodeOsRelease = os.release();
@@ -83,8 +82,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}`,
-    projectName: pkgname,
+    ua: `${nodeOs}/${nodeOsRelease} ${nodeArch}/unknown ${nodeLibc}`,
+    pkg: pkgname,
     tag: pkgtag || '',
     formats: formats,
     libc: nodeLibc,

brew/brew-update-service-install

@@ -6,23 +6,15 @@ main() { (
     sed '1,/^#~\/.local\/bin\/brew-updater/d' "${0}" > ~/.local/bin/brew-update-hourly
     chmod a+x ~/.local/bin/brew-update-hourly
 
-    echo "Checking for serviceman..."
-    if ! command -v serviceman > /dev/null; then
-        "$HOME/.local/bin/webi" serviceman
-        export PATH="$HOME/.local/bin:$PATH"
-        serviceman --version
-    fi
-
     env PATH="$PATH" serviceman add --user \
         --workdir ~/.local/opt/brew/ \
         --name sh.brew.updater -- \
         ~/.local/bin/brew-update-hourly
 ); }
 
-if ! main; then
-    exit 1
+if main; then
+    exit 0
 fi
-exit 0
 
 #~/.local/bin/brew-updater
 #!/bin/sh

cilium/README.md

@@ -1,47 +0,0 @@
----
-title: cilium
-homepage: https://github.com/cilium/cilium-cli
-tagline: |
-  cilium: manage & troubleshoot Kubernetes clusters running Cilium
----
-
-To update or switch versions, run `webi cilium@stable` (or `@v2`, `@beta`,etc).
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```text
-~/.config/envman/PATH.env
-~/.local/bin/cilium
-~/.local/opt/cilium/
-```
-
-## Cheat Sheet
-
-> Cilium is an open source, cloud native solution for providing, securing, and
-> observing network connectivity between workloads, fueled by the revolutionary
-> Kernel technology eBPF.
-
-Quick Start User Guide:
-
-<https://docs.cilium.io/en/stable/gettingstarted/k8s-install-default/#k8s-install-quick>
-
-To install the default version of the Cilium image:
-
-```sh
-cilium install
-```
-
-To upgrade to a specific version of the Cilium image:
-
-```sh
-cilium upgrade --version v1.15.3
-```
-
-To check the status of the current Cilium deployment:
-
-```sh
-cilium status
-```

cilium/install.ps1

@@ -1,45 +0,0 @@
-#!/usr/bin/env pwsh
-
-##################
-# Install cilium #
-##################
-
-$pkg_cmd_name = "cilium"
-
-$pkg_dst_cmd = "$Env:USERPROFILE\.local\bin\cilium.exe"
-$pkg_dst = "$pkg_dst_cmd"
-
-$pkg_src_cmd = "$Env:USERPROFILE\.local\opt\cilium-v$Env:WEBI_VERSION\bin\cilium.exe"
-$pkg_src_bin = "$Env:USERPROFILE\.local\opt\cilium-v$Env:WEBI_VERSION\bin"
-$pkg_src_dir = "$Env:USERPROFILE\.local\opt\cilium-v$Env:WEBI_VERSION"
-$pkg_src = "$pkg_src_cmd"
-
-New-Item "$Env:USERPROFILE\Downloads\webi" -ItemType Directory -Force | Out-Null
-$pkg_download = "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE"
-
-IF (!(Test-Path -Path "$Env:USERPROFILE\Downloads\webi\$Env:WEBI_PKG_FILE")) {
-    Write-Output "Downloading cilium from $Env:WEBI_PKG_URL to $pkg_download"
-    & curl.exe -A "$Env:WEBI_UA" -fsSL "$Env:WEBI_PKG_URL" -o "$pkg_download.part"
-    & Move-Item "$pkg_download.part" "$pkg_download"
-}
-
-IF (!(Test-Path -Path "$pkg_src_cmd")) {
-    Write-Output "Installing cilium"
-    Push-Location .local\tmp
-
-    Remove-Item -Path ".\cilium-v*" -Recurse -ErrorAction Ignore
-    Remove-Item -Path ".\cilium.exe" -Recurse -ErrorAction Ignore
-
-    Write-Output "Unpacking $pkg_download"
-    & tar xf "$pkg_download"
-
-    Write-Output "Install Location: $pkg_src_cmd"
-    New-Item "$pkg_src_bin" -ItemType Directory -Force
-    Move-Item -Path ".\cilium-*\cilium.exe" -Destination "$pkg_src_bin"
-
-    Pop-Location
-}
-
-Write-Output "Copying into '$pkg_dst_cmd' from '$pkg_src_cmd'"
-Remove-Item -Path "$pkg_dst_cmd" -Recurse -ErrorAction Ignore
-Copy-Item -Path "$pkg_src" -Destination "$pkg_dst" -Recurse

cilium/install.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-__init_cilium() {
-    set -e
-    set -u
-
-    ##################
-    # Install cilium #
-    ##################
-
-    pkg_cmd_name="cilium"
-
-    pkg_dst_cmd="$HOME/.local/bin/cilium"
-    pkg_dst="$pkg_dst_cmd"
-
-    pkg_src_cmd="$HOME/.local/opt/cilium-v$WEBI_VERSION/bin/cilium"
-    pkg_src_dir="$HOME/.local/opt/cilium-v$WEBI_VERSION"
-    pkg_src="$pkg_src_cmd"
-
-    WEBI_SINGLE=true
-
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/cilium-v0.16.16/bin
-        mkdir -p "$(dirname "${pkg_src_cmd}")"
-
-        # mv ./hugo ~/.local/opt/cilium-v0.16.16/bin/
-        mv ./cilium "${pkg_src_cmd}"
-    }
-
-    pkg_get_current_version() {
-        cilium version 2> /dev/null |
-            head -n 1 |
-            cut -d ' ' -f 2
-    }
-
-}
-
-__init_cilium

cilium/releases.js

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

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

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 mount /dev/sdx1 ${my_mount}"
+    echo >&2 "              sudo mkdir -p /mnt/EXAMPLE"
+    echo >&2 "              sudo mount /dev/sdx1 /mnt/EXAMPLE"
     echo >&2 ""
     echo >&2 "        2. Create a 'dashcore' inside of it"
     echo >&2 ""
@@ -112,7 +111,7 @@ fn_srv_install() { (
         echo "Installing 'serviceman'..."
         echo ""
         {
-            "$HOME/.local/bin/webi" serviceman
+            curl -fsSL "${WEBI_HOST}/serviceman" | sh
         } > /dev/null
 
         # shellcheck disable=SC1090

dashcore-utils/install.sh

@@ -5,38 +5,32 @@ set -u
 __install_dashcore_utils() {
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dash-qt-hd" \
-        "$HOME/.local/bin/dash-qt-hd" \
-        "dash-qt-hd"
+        "$HOME/.local/bin/dash-qt-hd"
     chmod a+x "$HOME/.local/bin/dash-qt-hd"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dash-qt-testnet" \
-        "$HOME/.local/bin/dash-qt-testnet" \
-        "dash-qt-testnet"
+        "$HOME/.local/bin/dash-qt-testnet"
     chmod a+x "$HOME/.local/bin/dash-qt-testnet"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dashd-hd" \
-        "$HOME/.local/bin/dashd-hd" \
-        "dashd-hd"
+        "$HOME/.local/bin/dashd-hd"
     chmod a+x "$HOME/.local/bin/dashd-hd"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dashd-testnet" \
-        "$HOME/.local/bin/dashd-testnet" \
-        "dashd-testnet"
+        "$HOME/.local/bin/dashd-testnet"
     chmod a+x "$HOME/.local/bin/dashd-testnet"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dashd-hd-service-install" \
-        "$HOME/.local/bin/dashd-hd-service-install" \
-        "dashd-hd-service-install"
+        "$HOME/.local/bin/dashd-hd-service-install"
     chmod a+x "$HOME/.local/bin/dashd-hd-service-install"
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dashd-testnet-service-install" \
-        "$HOME/.local/bin/dashd-testnet-service-install" \
-        "dashd-testnet-service-install"
+        "$HOME/.local/bin/dashd-testnet-service-install"
     chmod a+x "$HOME/.local/bin/dashd-testnet-service-install"
 
     if ! test -e "${HOME}/.dashcore"; then
@@ -50,8 +44,7 @@ __install_dashcore_utils() {
 
     webi_download \
         "$WEBI_HOST/packages/dashcore-utils/dash.example.conf" \
-        "$HOME/.dashcore/dash.example.conf" \
-        "dash.example.conf"
+        "$HOME/.dashcore/dash.example.conf"
 
     if ! grep -q rpcuser ~/.dashcore/dash.conf; then
         cat ~/.dashcore/dash.example.conf >> ~/.dashcore/dash.conf

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

flutter/releases.js

@@ -66,10 +66,10 @@ module.exports = async function (request) {
       json: true,
     });
 
-    let osBaseUrl = resp.body.base_url;
-    let osReleases = resp.body.releases;
+    let body = resp.body;
+    all.download = `${body.base_url}/{{ download }}`;
 
-    for (let asset of osReleases) {
+    for (let asset of body.releases) {
       if (!channelMap[asset.channel]) {
         channelMap[asset.channel] = true;
       }
@@ -81,8 +81,7 @@ module.exports = async function (request) {
         channel: asset.channel,
         date: asset.release_date.replace(/T.*/, ''),
         //sha256: asset.sha256,
-        download: `${osBaseUrl}/${asset.archive}`,
-        _filename: asset.archive,
+        download: asset.archive,
       });
     }
   }

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

@@ -44,7 +44,7 @@ function getAllReleases(request) {
     var goReleases = resp.body;
     var all = {
       releases: [],
-      download: '',
+      download: 'https://dl.google.com/go/{{ download }}',
     };
 
     goReleases.forEach((release) => {
@@ -77,7 +77,7 @@ function getAllReleases(request) {
           arch: arch,
           ext: '', // let normalize run the split/test/join
           hash: '-', // not ready to standardize this yet
-          download: `https://dl.google.com/go/${filename}`,
+          download: filename,
         });
       });
     });

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

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

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/install.sh

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

pyenv/README.md

@@ -7,6 +7,22 @@ tagline: |
 
 To update run `pyenv update`.
 
+### Files
+
+These are the files / directories that are created and/or modified with this
+install:
+
+```sh
+~/.config/envman/PATH.env
+~/.pyenv/bin/
+~/.pyenv/shims/
+
+# pyenv also loads shell hooks via
+~/.bashrc
+~/.config/fish/config.fish
+~/.zshrc
+```
+
 ### How to Install pyenv on macOS
 
 Install Xcode tools first:
@@ -22,21 +38,11 @@ Make sure that you already have the necessary build tools installed:
 ```sh
 # required
 sudo apt update
-sudo apt install -y build-essential zlib1g-dev libssl-dev \
-                    libreadline-dev liblzma-dev
+sudo apt install -y build-essential zlib1g-dev libssl-dev
 
 # recommended
-sudo apt install -y libsqlite3-dev libffi-dev libbz2-dev
-```
-
-### How to Install pyenv on Alpine
-
-```sh
-sudo apk add \
-    bash \
-    build-base \
-    git \
-    zlib-dev
+sudo apt install -y libreadline-dev libsqlite3-dev \
+                    libffi-dev libbz2-dev liblzma-dev
 ```
 
 ## Cheat Sheet
@@ -76,34 +82,6 @@ Revert back to your system python:
 pyenv global system
 ```
 
-## Table of Contents
-
-- Files
-- List Installable Versions
-- Install a Specific Version
-- Install Local to a Project
-- `virtualenv`s
-  - List Existing
-  - Create New
-  - Activate / Deactivate
-  - Delete
-
-### Files
-
-These are the files / directories that are created and/or modified with this
-install:
-
-```sh
-~/.config/envman/PATH.env
-~/.pyenv/bin/
-~/.pyenv/shims/
-
-# pyenv also loads shell hooks via
-~/.bashrc
-~/.config/fish/config.fish
-~/.zshrc
-```
-
 ### List all available python version
 
 ```sh

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

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
 }

ssh-pubkey/ssh-pubkey

@@ -2,100 +2,43 @@
 set -e
 set -u
 
-fn_warn_rsa() { (
-    echo 'WARNING'
-    echo '    ~/.ssh/id_rsa is less than the required 3072 bits'
-    echo '    (some modern services will reject your key)'
-
-    echo ''
-    echo 'SOLUTION'
-    echo '    Generate a new key, and update accordingly'
-
-    my_ts="$(date -u "+%F_%H.%M.%S")"
-
-    echo ''
-    echo '    # OPTION 1: Generate a more efficient, ED25519 256-bit key'
-    echo '    #           and update your ~/.ssh/config accordingly'
-    echo "    mv ~/.ssh/id_rsa ~/.ssh/id_rsa.${my_ts}.bak"
-    # shellcheck disable=SC2016
-    echo '    ssh-keygen -t ed25519 -f ~/.ssh/id_ed25519 -q -N ""'
-    echo "    echo 'Host *
-        IdentityFile ~/.ssh/id_ed25519
-        IdentityFile ~/.ssh/id_rsa.${my_ts}.bak' >> ~/.ssh/config"
-
-    echo ''
-    echo '    # OPTION 2: Generate a larger, 4096-bit RSA key"'
-    echo '    #           and update your ~/.ssh/config accordingly'
-    echo "    mv ~/.ssh/id_rsa ~/.ssh/id_rsa.${my_ts}.bak"
-    # shellcheck disable=SC2016
-    echo '    ssh-keygen -t rsa -b 4096 -f ~/.ssh/id_rsa -q -N ""'
-    echo "    echo 'Host *
-        IdentityFile ~/.ssh/id_rsa
-        IdentityFile ~/.ssh/id_rsa.${my_ts}.bak' >> ~/.ssh/config"
-); }
-
 main() {
 
-    if ! test -d ~/.ssh; then
-        mkdir -p ~/.ssh/
-        chmod 0700 ~/.ssh/
+    if [ ! -d "$HOME/.ssh" ]; then
+        mkdir -p "$HOME/.ssh/"
+        chmod 0700 "$HOME/.ssh/"
     fi
 
-    if ! test -f ~/.ssh/config; then
+    if [ ! -f "$HOME/.ssh/config" ]; then
         # for the benefit of VSCode
-        touch ~/.ssh/config
-        chmod 0644 ~/.ssh/config
+        touch "$HOME/.ssh/config"
+        chmod 0644 "$HOME/.ssh/config"
     fi
 
-    if ! test -f ~/.ssh/authorized_keys; then
-        touch ~/.ssh/authorized_keys
-        chmod 0600 ~/.ssh/authorized_keys
+    if [ ! -f "$HOME/.ssh/authorized_keys" ]; then
+        touch "$HOME/.ssh/authorized_keys"
+        chmod 0600 "$HOME/.ssh/authorized_keys"
     fi
 
-    my_keytype=''
-    if test -f ~/.ssh/id_ed25519; then
-        my_keytype='ed25519'
-        if ! test -f ~/.ssh/id_ed25519.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_ed25519 > ~/.ssh/id_ed25519.pub
-        fi
-    elif test -f ~/.ssh/id_rsa; then
-        my_keytype='rsa'
-        if ! test -f ~/.ssh/id_rsa.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
-        fi
-    elif test -f ~/.ssh/id_ecda; then
-        my_keytype='ecdsa'
-        if ! test -f ~/.ssh/id_ecdsa.pub; then
-            echo >&2 ""
-            ssh-keygen -y -f ~/.ssh/id_ecda > ~/.ssh/id_ecda.pub
-        fi
-    else
-        my_keytype='rsa'
+    if [ ! -f "$HOME/.ssh/id_rsa" ]; then
+        ssh-keygen -b 2048 -t rsa -f "$HOME/.ssh/id_rsa" -q -N ""
+        echo >&2 ""
+    fi
+
+    if [ ! -f "$HOME/.ssh/id_rsa.pub" ]; then
+        ssh-keygen -y -f "$HOME/.ssh/id_rsa" > "$HOME/.ssh/id_rsa.pub"
         echo >&2 ""
-        echo >&2 "Generating public/private rsa key pair."
-        ssh-keygen -b 4096 -t rsa -f ~/.ssh/id_rsa -q -N ""
-        ssh-keygen -y -f ~/.ssh/id_rsa > ~/.ssh/id_rsa.pub
     fi
 
     # TODO use the comment (if any) for the name of the file
     echo >&2 ""
     #shellcheck disable=SC2088
-    echo >&2 "~/Downloads/id_${my_keytype}.$(whoami).pub":
+    echo >&2 "~/Downloads/id_rsa.$(whoami).pub":
     echo >&2 ""
-    rm -f "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
-    cp -RPp "$HOME/.ssh/id_${my_keytype}.pub" "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
-    cat "$HOME/Downloads/id_${my_keytype}.$(whoami).pub"
+    rm -f "$HOME/Downloads/id_rsa.$(whoami).pub"
+    cp -r "$HOME/.ssh/id_rsa.pub" "$HOME/Downloads/id_rsa.$(whoami).pub"
+    cat "$HOME/Downloads/id_rsa.$(whoami).pub"
     echo >&2 ""
-
-    if test -f ~/.ssh/id_rsa; then
-        my_rsa_chars="$(cat ~/.ssh/id_rsa)"
-        if test "${#my_rsa_chars}" -lt 2500; then
-            fn_warn_rsa >&2
-            echo >&2 ""
-        fi
-    fi
 }
 
 main

vim-devicons/README.md

@@ -1,6 +1,6 @@
 ---
 title: vim-devicons
-homepage: https://github.com/ryanoasis/vim-devicons
+homepage: https://github.com/ryanoasis/devicons
 tagline: |
   VimDevIcons: Adds Icons to Your Plugins.
 ---

vim-things.sh

@@ -0,0 +1,12 @@
+vim README.md
+vim _webi/template.ps1
+vim _webi/template.sh
+vim brew/install.sh
+vim git/install.ps1
+vim golang/install.ps1
+vim golang/install.sh
+vim node/install.ps1
+vim postgres/install.sh
+vim sass/install.ps1
+vim webi/install.sh
+vim zig/install.ps1

webi-essentials/install.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e
 set -u
+#set -x
 
 fn_install_webi_essentials_macos() { (
     # streamline the output to be pretty
@@ -180,7 +181,7 @@ _install_webi_essentials() { (
         fi
     fi
 
-    printf '%s' "    $(t_dim 'Checking for apt/apk/pkg_add ...')"
+    printf '%s' "    $(t_dim 'Checking for apt/apk ...')"
     if command -v apt > /dev/null; then
         echo " $(t_pkg 'apt')"
         _install_webi_essentials_apt "${cmd_sudo}" "${b_pkgs}"
@@ -195,13 +196,6 @@ _install_webi_essentials() { (
         return 0
     fi
 
-    if command -v pkg_add > /dev/null; then
-        echo " $(t_pkg 'pkg_add')"
-        _install_webi_essentials_pkg_add "${cmd_sudo}" "${b_pkgs}"
-        echo "    $(t_dim 'OK')"
-        return 0
-    fi
-
     echo " $(t_dim 'none')"
     _install_webi_essentials_webi "${cmd_sudo}" "${b_pkgs}"
     echo "    $(t_dim 'OK')"
@@ -237,21 +231,11 @@ _install_webi_essentials_apk() { (
     ${cmd_sudo} apk add --no-cache ${b_pkgs}
 ); }
 
-_install_webi_essentials_pkg_add() { (
-    cmd_sudo="${1}"
-    b_pkgs="${2}"
-
-    echo "    $(t_dim 'Running') $(t_cmd "${cmd_sudo}pkg_add")"
-    fn_polite_sudo "${cmd_sudo}" "    $(t_cmd "pkg_add ${b_pkgs}")"
-    # shellcheck disable=SC2086
-    ${cmd_sudo} pkg_add ${b_pkgs}
-); }
-
 _install_webi_essentials_webi() { (
     cmd_sudo="${1}"
     b_pkgs="${2}"
 
-    if test "${b_pkgs}" = 'xz'; then
+    if test "${b_pkgs}" == 'xz'; then
         ~/.local/bin/webi xz
         return 0
     fi

webi/releases.js

@@ -0,0 +1,43 @@
+'use strict';
+
+module.exports = async function () {
+  return {
+    releases: [
+      {
+        name: 'webi.tar',
+        version: '0.0.0',
+        lts: false,
+        channel: 'stable',
+        date: '',
+        os: 'linux',
+        arch: 'amd64',
+        ext: 'tar',
+        download: '',
+      },
+      {
+        name: 'webi.tar',
+        version: '0.0.0',
+        lts: false,
+        channel: 'stable',
+        date: '',
+        os: 'macos',
+        arch: 'amd64',
+        ext: 'tar',
+        download: '',
+      },
+      {
+        name: 'webi.tar',
+        version: '0.0.0',
+        lts: false,
+        channel: 'stable',
+        date: '',
+        os: 'windows',
+        arch: 'amd64',
+        ext: 'tar',
+        download: '',
+      },
+    ],
+    formats: [],
+    downloads: '',
+  };
+};

webi/webi-pwsh.ps1

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

webi/webi.sh

@@ -63,11 +63,10 @@ __webi_main() {
     export WEBI_URL
     set -e
 
-    my_uname_o="$(uname -o 2> /dev/null || echo '')"
     my_libc=''
     if ldd /bin/ls 2> /dev/null | grep -q 'musl' 2> /dev/null; then
         my_libc='musl'
-    elif echo "${my_uname_o}" | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
+    elif uname -o | grep -q 'GNU' || uname -s | grep -q 'Linux'; then
         my_libc='gnu'
     else
         my_libc='libc'
@@ -142,30 +141,16 @@ __webi_main() {
     }
 
     fn_checksum() {
-        a_filepath="${1}"
-
-        if command -v sha1sum > /dev/null; then
-            sha1sum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-            return 0
-        fi
-
+        cmd_shasum='sha1sum'
         if command -v shasum > /dev/null; then
-            shasum "${a_filepath}" | cut -d' ' -f1 | cut -c 1-8
-            return 0
+            cmd_shasum='shasum'
         fi
-
-        if command -v sha1 > /dev/null; then
-            sha1 "${a_filepath}" | cut -d'=' -f2 | cut -c 2-9
-            return 0
-        fi
-
-        echo >&2 "    warn: no sha1 sum program"
-        date '+%F %H:%M'
+        $cmd_shasum "${0}" | cut -d' ' -f1 | cut -c 1-8
     }
 
     version() {
         my_checksum="$(
-            fn_checksum "${0}"
+            fn_checksum
         )"
         my_version=v1.2.8
         printf "\e[35mwebi\e[32m %s\e[0m Copyright 2020+ AJ ONeal\n" "${my_version} (${my_checksum})"

xcode-cli

@@ -1 +0,0 @@
-commandlinetools