No pre-reqs (#270)

Windows installer installs without admin privs

Author: mxcl

.github/workflows/ci.action.yml

@@ -94,3 +94,32 @@ jobs:
       - run: git clean -xfd
       - uses: ./
       - run: pkgx --version
+      - uses: actions/upload-artifact@v4
+        with:
+          path: |
+            ./action.js
+            ./action.yml
+          name: action
+
+  linuxen:
+    needs: dist
+    continue-on-error: true
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        container:
+          - debian:buster-slim
+          - debian:bullseye-slim
+          - debian:bookworm-slim
+          - archlinux:latest
+          - ubuntu:focal
+          - ubuntu:jammy
+          - ubuntu:noble
+          - fedora:latest
+    container: ${{ matrix.container }}
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: action
+      - uses: ./
+      - run: pkgx node -e 'console.log(1)'

.github/workflows/ci.installer.yml

@@ -180,15 +180,15 @@ jobs:
         env:
           PATH: ${{ github.workspace }}/bin:/usr/bin:/bin
 
-      - run: pkgx deno eval 'console.log(1)'
+      - run: pkgx node -e 'console.log(1)'
 
   windows:
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
       - run: .\\installer.ps1
       - run: |
-          $env:Path += ";C:\Program Files\pkgx"
+          $env:Path += ";$env:LOCALAPPDATA\pkgx"
           pkgx +zlib.net
 
   upgrades:

README.md

@@ -43,11 +43,16 @@ just slow things down.
 
 ## Version History
 
+* `v4` defaults to `pkgx`^2, uses node^20 and doesn’t install any pre-reqs on Linux†
 * `v3` defaults to `pkgx`^2 and uses node^20
 * `v2` defaults to `pkgx`^1 and uses node^20
 * `v1` defaults to `pkgx`@latest and uses node^16
 * `v0` should not be used
 
+> † `pkgx` requires glibc>=2.28, libgcc, libstdc++ and libatomic. Generally
+> images come installed with these. If you are building binaries you may need
+> the `-dev` versions of these packages also.
+
  
 
 

action.js

@@ -1,4 +1,5 @@
 const { execSync } = require('child_process');
+const unzipper = require('unzipper');
 const semver = require('semver');
 const https = require('https');
 const path = require('path');
@@ -27,23 +28,31 @@ function platform_key() {
 }
 
 function downloadAndExtract(url, destination, strip) {
+
   return new Promise((resolve, reject) => {
     https.get(url, (response) => {
       if (response.statusCode !== 200) {
         reject(new Error(`Failed to get '${url}' (${response.statusCode})`));
         return;
       }
 
-      console.log(`extracting tarball…`);
-
-      const tar_stream = tar.x({ cwd: destination, strip });
+      console.log(`extracting pkgx archive…`);
 
-      response
-        .pipe(tar_stream) // Extract directly to destination
-        .on('finish', resolve)
-        .on('error', reject);
-
-      tar_stream.on('error', reject);
+      if (platform_key().startsWith('windows')) {
+        const unzip_stream = unzipper.Extract({ path: destination });
+        response
+          .pipe(unzip_stream)
+          .promise()
+          .then(resolve, reject);
+        unzip_stream.on('error', reject);
+      } else {
+        const tar_stream = tar.x({ cwd: destination, strip });
+        response
+          .pipe(tar_stream)
+          .on('finish', resolve)
+          .on('error', reject);
+        tar_stream.on('error', reject);
+      }
 
     }).on('error', reject);
   });
@@ -93,7 +102,7 @@ async function install_pkgx() {
     if (platform_key().startsWith('windows')) {
       // not yet versioned
       strip = 0;
-      return 'https://pkgx.sh/Windows/x86_64.tgz';
+      return 'https://pkgx.sh/Windows/x86_64.zip';
     }
 
     let url = `https://dist.pkgx.dev/pkgx.sh/${platform_key()}/versions.txt`;
@@ -139,13 +148,6 @@ async function install_pkgx() {
     fs.appendFileSync(process.env["GITHUB_ENV"], `PKGX_DIR=${process.env.INPUT_PKGX_DIR}\n`);
   }
 
-  if (os.platform() == 'linux') {
-    console.log(`::group::installing pre-requisites`);
-    const installer_script_path = path.join(path.dirname(__filename), "installer.sh");
-    execSync(installer_script_path, {env: {PKGX_INSTALL_PREREQS: '1', ...process.env}});
-    console.log(`::endgroup::`);
-  }
-
   if (process.env['INPUT_+']) {
     console.log(`::group::installing pkgx input packages`);
     let args = process.env['INPUT_+'].split(' ');

installer.ps1

@@ -2,8 +2,8 @@
 
 $ErrorActionPreference = "Stop"
 
-# Determine install location
-$installDir = "$env:ProgramFiles\pkgx"
+# Determine install location for the current user
+$installDir = "$env:LOCALAPPDATA\pkgx"
 
 # Create directory if it doesn't exist
 if (!(Test-Path $installDir)) {
@@ -17,10 +17,10 @@ Invoke-WebRequest -Uri $zipUrl -OutFile $zipFile
 Expand-Archive -Path $zipFile -DestinationPath $installDir -Force
 Remove-Item $zipFile
 
-# Ensure PATH is updated
-$envPath = [System.Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::Machine)
+# Ensure user's PATH is updated
+$envPath = [System.Environment]::GetEnvironmentVariable("Path", [System.EnvironmentVariableTarget]::User)
 if ($envPath -notlike "*$installDir*") {
-    [System.Environment]::SetEnvironmentVariable("Path", "$envPath;$installDir", [System.EnvironmentVariableTarget]::Machine)
+    [System.Environment]::SetEnvironmentVariable("Path", "$envPath;$installDir", [System.EnvironmentVariableTarget]::User)
 }
 
 Write-Host "pkgx installed successfully! Restart your terminal to use it."

installer.sh

@@ -5,7 +5,6 @@ set -e
 _main() {
   if _should_install_pkgx; then
     _install_pkgx "$@"
-    _install_pre_reqs
   elif [ $# -eq 0 ]; then
     echo /usr/local/bin/"$(pkgx --version) already installed" >&2
     echo /usr/local/bin/"$(pkgm --version) already installed" >&2
@@ -47,70 +46,6 @@ _is_ci() {
   [ -n "$CI" ] && [ $CI != 0 ]
 }
 
-_install_pre_reqs() {
-  if _is_ci; then
-    apt() {
-      # we should use apt-get not apt in CI
-      # weird shit ref: https://askubuntu.com/a/668859
-      export DEBIAN_FRONTEND=noninteractive
-      cmd=$1
-      shift
-      $SUDO apt-get $cmd --yes -qq -o=Dpkg::Use-Pty=0 $@
-    }
-  else
-    apt() {
-      case "$1" in
-      update)
-        echo "ensure you have the \`pkgx\` pre-requisites installed:" >&2
-        ;;
-      install)
-        echo "   apt-get" "$@" >&2
-        ;;
-      esac
-    }
-    yum() {
-      echo "ensure you have the \`pkgx\` pre-requisites installed:" >&2
-      echo "   yum" "$@" >&2
-    }
-    pacman() {
-      echo "ensure you have the \`pkgx\` pre-requisites installed:" >&2
-      echo "   pacman" "$@" >&2
-    }
-  fi
-
-  if test -f /etc/debian_version; then
-    apt update
-
-    # minimal but required or networking doesn’t work
-    # https://packages.debian.org/buster/all/netbase/filelist
-    A="netbase"
-
-    # difficult to pkg in our opinion
-    B=libudev-dev
-
-    # ca-certs needed until we bundle our own root cert
-    C=ca-certificates
-
-    case $(cat /etc/debian_version) in
-    jessie/sid|8.*|stretch/sid|9.*)
-      apt install libc-dev libstdc++-4.8-dev libgcc-4.7-dev $A $B $C;;
-    buster/sid|10.*)
-      apt install libc-dev libstdc++-8-dev libgcc-8-dev $A $B $C;;
-    bullseye/sid|11.*)
-      apt install libc-dev libstdc++-10-dev libgcc-9-dev $A $B $C;;
-    bookworm/sid|12.*|*)
-      apt install libc-dev libstdc++-11-dev libgcc-11-dev $A $B $C;;
-    esac
-  elif test -f /etc/fedora-release; then
-    $SUDO yum --assumeyes install libatomic
-  elif test -f /etc/arch-release; then
-    # installing gcc isn't my favorite thing, but even clang depends on it
-    # on archlinux. it provides libgcc. since we use it for testing, the risk
-    # to our builds is very low.
-    $SUDO pacman --noconfirm -Sy gcc libatomic_ops libxcrypt-compat
-  fi
-}
-
 _install_pkgx() {
   if _is_ci; then
     progress="--no-progress-meter"
@@ -122,23 +57,27 @@ _install_pkgx() {
 
   if [ $# -eq 0 ]; then
     if [ -f /usr/local/bin/pkgx ]; then
-      echo "upgrading: /usr/local/bin/pkg[xm]" >&2
+      echo "upgrading: /usr/local/bin/pkgx" >&2
     else
-      echo "installing: /usr/local/bin/pkg[xm]" >&2
+      echo "installing: /usr/local/bin/pkgx" >&2
     fi
 
     # using a named pipe to prevent curl progress output trumping the sudo password prompt
     pipe="$tmpdir/pipe"
     mkfifo "$pipe"
 
-    curl --silent --fail --proto '=https' -o "$tmpdir/pkgm" \
-      https://pkgxdev.github.io/pkgm/pkgm.ts
-
     curl $progress --fail --proto '=https' "https://pkgx.sh/$(uname)/$(uname -m)".tgz > "$pipe" &
     $SUDO sh -c "
       mkdir -p /usr/local/bin
       tar xz --directory /usr/local/bin < '$pipe'
-      install -m 755 "$tmpdir/pkgm" /usr/local/bin
+      if [ ! -f /usr/local/bin/pkgm ]; then
+        echo '#!/usr/bin/env -S pkgx -q! pkgm' > /usr/local/bin/pkgm
+        chmod +x /usr/local/bin/pkgm
+      fi
+      if [ ! -f /usr/local/bin/mash ]; then
+        echo '#!/usr/bin/env -S pkgx -q! mash' > /usr/local/bin/mash
+        chmod +x /usr/local/bin/mash
+      fi
     " &
     wait
 
@@ -151,7 +90,8 @@ _install_pkgx() {
 
     # tell the user what version we just installed
     pkgx --version
-    pkgm --version
+    pkgx pkgm@latest --version
+    pkgx mash@latest --version
 
   else
     curl $progress --fail --proto '=https' \
@@ -201,8 +141,4 @@ _should_install_pkgx() {
 }
 
 _prep
-if [ "$PKGX_INSTALL_PREREQS" != 1 ]; then
-  _main "$@"
-else
-  _install_pre_reqs
-fi
+_main "$@"