pear-install 1.0.6 → 1.0.8

package/README.md

@@ -20,7 +20,7 @@ npx pear-install [link]
 
 - **macOS** — apps to `/Applications`, bins to `/usr/local/bin`
 - **Linux** — apps to `~/Applications`, `~/AppImages`, or `~/.local/bin`; bins to `~/.local/bin`
-- **Windows** — apps and bins installed as MSIX packages
+- **Windows** — apps installed as MSIX packages; bins (`.exe`) to `%LOCALAPPDATA%\Programs\<app>\` with the install directory added to the User `PATH`
 
 ## API
 
@@ -68,8 +68,9 @@ await corestore.close()
 ### Events
 
 - `installing` → `{ link, host }`
-- `app` → `{ app, name, version, upgrade, key, dest }`
+- `app` → `{ app, name, version, upgrade, verlink, key, dest }`
 - `stats` → `{ download, upload, peers }`
+- `path` → `{ dir }` — Windows only; emitted when a bin directory is appended to the User `PATH`
 - `final` → `{ success, installed, exists }`
 
 ## Command Integration: `/cmd`
@@ -86,8 +87,9 @@ await InstallCmd.output(json, stream)
 ### Tags
 
 - `installing` → `{ link, host }`
-- `app` → `{ app, name, version, upgrade, key, dest }`
+- `app` → `{ app, name, version, upgrade, verlink, key, dest }`
 - `stats` → `{ download, upload, peers }`
+- `path` → `{ dir }` — Windows only
 - `error` → `{ code, message, stack, info, success: false }`
 - `final` → `{ success, installed, exists }`
 

package/cmd.js

@@ -11,8 +11,8 @@ const down = isWindows ? '↓' : '⬇'
 class InstallCmd extends Opstream {
   static outputs = {
     installing: ({ link }) => `Installing... ${link}`,
-    app: ({ app, version, upgrade, dest, key }) =>
-      `App: ${app}\nVersion: ${version}\nLink: ${upgrade}\nPathname: ${key}\nTarget: ${dest}`,
+    app: ({ app, version, upgrade, dest, key, verlink }) =>
+      `App: ${app}\nVersion: ${version}\nLink: ${upgrade}\nVerlink: ${verlink}\nPathname: ${key}\nTarget: ${dest}`,
     stats({ download, peers }) {
       const dl =
         download.bytes + download.speed === 0
@@ -20,6 +20,7 @@ class InstallCmd extends Opstream {
           : ` [ ${down} ${byteSize(download.bytes)} - ${byteSize(download.speed)}/s ] `
       return `[ Peers: ${peers} ]${dl}`
     },
+    path: ({ dir }) => `Added to User PATH: ${dir}\n  Restart shell for change to take effect.`,
     error: ({ message }) => message,
     final({ success, message }) {
       if (success) return 'Installed'
@@ -78,6 +79,9 @@ class InstallCmd extends Opstream {
     install.on('stats', (data) => {
       this.push({ tag: 'stats', data })
     })
+    install.on('path', (data) => {
+      this.push({ tag: 'path', data })
+    })
     install.on('final', (data) => {
       this.final = data
     })

package/index.js

@@ -99,16 +99,18 @@ class Install extends ReadyResource {
     const appName = productName ?? name
     const home = os.homedir()
 
+    const localAppData = process.env.LOCALAPPDATA || path.join(home, 'AppData', 'Local')
+
     if (bin) {
       const bins = typeof bin === 'string' ? { [name]: bin } : bin
       for (const binName of Object.keys(bins)) {
-        const ext = isWindows ? '.msix' : ''
-        const dest = isWindows
-          ? null
-          : to
-            ? path.join(to, binName + ext)
-            : isMac
-              ? path.join('/', 'usr', 'local', 'bin', binName)
+        const ext = isWindows ? '.exe' : ''
+        const dest = to
+          ? path.join(to, binName + ext)
+          : isMac
+            ? path.join('/', 'usr', 'local', 'bin', binName)
+            : isWindows
+              ? path.join(localAppData, 'Programs', appName, binName + ext)
               : path.join(home, '.local', 'bin', binName)
         this.targets.push({ filename: binName, ext, dest, isBin: true })
       }
@@ -151,27 +153,28 @@ class Install extends ReadyResource {
     const exists = []
     const installs = []
     for (const target of this.targets) {
-      if (isWindows) {
+      if (target.ext === '.msix') {
+        const escName = name.replace(/'/g, "''")
         const ps = spawnSync('powershell', [
           '-NoProfile',
           '-Command',
-          `(Get-AppxPackage '${target.filename}') -ne $null`
+          `$null -ne (Get-AppxPackage -Name '${escName}' -ErrorAction SilentlyContinue)`
         ])
         if (ps.stdout.toString().trim() === 'True') {
-          exists.push({ filename: target.filename, dest: target.dest })
+          exists.push({ filename: target.filename, dest: target.dest, ext: target.ext })
           continue
         }
       } else if (fs.existsSync(target.dest)) {
-        exists.push({ filename: target.filename, dest: target.dest })
+        exists.push({ filename: target.filename, dest: target.dest, ext: target.ext })
         continue
       }
       installs.push(target)
     }
 
     if (installs.length === 0) {
-      const message = isWindows
-        ? `Already installed:\n${exists.map(({ filename }) => '  ' + filename).join('\n')}\n  Manually uninstall first to reinstall`
-        : `Refusing to overwrite existing:\n${exists.map(({ dest }) => '  ' + dest).join('\n')}\n  Manually remove first to reinstall`
+      const lines = exists.map(({ filename, dest }) => '  ' + (dest ?? filename))
+      const header = isWindows ? 'Already installed:' : 'Refusing to overwrite existing:'
+      const message = `${header}\n${lines.join('\n')}\nTo reinstall, manually remove then rerun command`
       throw ERR_EXISTS(message)
     }
 
@@ -190,9 +193,20 @@ class Install extends ReadyResource {
     monitor.destroy()
 
     let installed = 0
+    const exes = new Set()
     for (const { filename, ext, dest, isBin } of installs) {
       const key = appPath + filename + ext
-      this.emit('app', { app: filename, name, version, upgrade, key, tmp, dest })
+      const verlink = plink.serialize({ drive: this.drive.core })
+      this.emit('app', {
+        app: filename,
+        name,
+        version,
+        upgrade,
+        verlink,
+        key,
+        tmp,
+        dest
+      })
 
       const from = path.join(tmp, 'by-arch', host, 'app', filename + ext)
 
@@ -200,11 +214,13 @@ class Install extends ReadyResource {
         throw ERR_NOT_FOUND(plink.serialize({ ...parsed, pathname: key }))
       }
 
-      if (isWindows) {
+      if (ext === '.msix') {
         const MSIXManager = require('msix-manager')
         await new MSIXManager().addPackage(from)
         installed++
         continue
+      } else if (ext === '.exe') {
+        exes.add(dest)
       }
 
       if (isBin) {
@@ -242,6 +258,9 @@ class Install extends ReadyResource {
     if (installed === 0) {
       throw ERR_UNKNOWN('Failed to install')
     }
+
+    for (const dest of exes) this._exe(path.dirname(dest))
+
     this.emit('final', { success: true, installed, exists })
   }
 
@@ -266,6 +285,34 @@ class Install extends ReadyResource {
     )
   }
 
+  _exe(dir) {
+    const read = spawnSync('powershell', [
+      '-NoProfile',
+      '-Command',
+      "[Environment]::GetEnvironmentVariable('Path', 'User')"
+    ])
+    if (read.status !== 0) {
+      const err = (read.stderr || '').toString().trim()
+      throw new Error('Failed to read User PATH: ' + (err || 'powershell exit ' + read.status))
+    }
+    const current = read.stdout.toString().replace(/\r?\n$/, '')
+    const entries = current ? current.split(';').filter(Boolean) : []
+    if (entries.includes(dir)) return false
+    const next = (current ? current + ';' : '') + dir
+    const escNext = next.replace(/'/g, "''")
+    const write = spawnSync('powershell', [
+      '-NoProfile',
+      '-Command',
+      `[Environment]::SetEnvironmentVariable('Path', '${escNext}', 'User')`
+    ])
+    if (write.status !== 0) {
+      const err = (write.stderr || '').toString().trim()
+      throw new Error('Failed to update User PATH: ' + (err || 'powershell exit ' + write.status))
+    }
+    this.emit('path', { dir })
+    return true
+  }
+
   _extract(appImage, extracted, cwd, file) {
     const { status } = spawnSync(appImage, ['--appimage-extract', file], { cwd })
     if (status !== 0) throw new Error('appimage-extract failed')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-install",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "index.js",
   "type": "commonjs",
   "description": "Install Pear and Pear Applications",