@oclif/plugin-update 4.7.52 → 4.7.54

package/README.md

@@ -81,7 +81,7 @@ EXAMPLES
     $ oclif-example update --available
 ```
 
-_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/4.7.52/src/commands/update.ts)_
+_See code: [src/commands/update.ts](https://github.com/oclif/plugin-update/blob/4.7.54/src/commands/update.ts)_
 <!-- commandsstop -->
 
 # Contributing

package/dist/update.d.ts

@@ -18,6 +18,7 @@ export declare class Updater {
     private fetchVersionManifest;
     private findLocalVersion;
     private refreshConfig;
+    private resolveActiveDir;
     private tidy;
     private touch;
     private update;

package/dist/update.js

@@ -171,6 +171,23 @@ get_script_dir () {
     async refreshConfig(version) {
         this.config = await Config.load({ root: join(this.clientRoot, version) });
     }
+    // Resolves the absolute path of the active install directory. Installed
+    // directories are named "<version>-<sha>", but `this.config.version` is plain
+    // semver, so match by exact name or "<version>-" prefix. Falls back to the
+    // bare version path when no match exists.
+    async resolveActiveDir() {
+        const { version } = this.config;
+        try {
+            const entries = await readdir(this.clientRoot);
+            const match = entries.find((entry) => entry === version || entry.startsWith(`${version}-`));
+            if (match)
+                return join(this.clientRoot, match);
+        }
+        catch {
+            // fall through to bare version path
+        }
+        return join(this.clientRoot, version);
+    }
     // removes any unused CLIs
     async tidy() {
         debug('tidy');
@@ -179,7 +196,16 @@ get_script_dir () {
             if (!existsSync(root))
                 return;
             const files = await ls(root);
-            const isNotSpecial = (fPath, version) => !['bin', 'current', version].includes(basename(fPath));
+            // `version` is plain semver (e.g. "1.2.3") but installed directories are
+            // named "<version>-<sha>" (e.g. "1.2.3-abc1234"). Protect both forms so
+            // the active CLI never deletes itself. See #1361.
+            const isNotSpecial = (fPath, version) => {
+                const name = basename(fPath);
+                if (name === 'bin' || name === 'current')
+                    return false;
+                // "1.2.3" or "1.2.3-abc1234" both start from `version`
+                return !(name === version || name.startsWith(`${version}-`));
+            };
             const isOld = (fStat) => {
                 const { mtime } = fStat;
                 mtime.setHours(mtime.getHours() + 42 * 24);
@@ -196,7 +222,12 @@ get_script_dir () {
     async touch() {
         // touch the client so it won't be tidied up right away
         try {
-            const p = join(this.clientRoot, this.config.version);
+            // `this.config.version` is plain semver, but the installed directory is
+            // named "<version>-<sha>", so joining the bare version would point at a
+            // non-existent path and silently no-op. Resolve the real directory the
+            // same way tidy()'s guard does so the active install's mtime is refreshed
+            // and it isn't considered "old". See #1361.
+            const p = await this.resolveActiveDir();
             debug('touching client at', p);
             if (!existsSync(p))
                 return;

package/oclif.manifest.json

@@ -106,5 +106,5 @@
       ]
     }
   },
-  "version": "4.7.52"
+  "version": "4.7.54"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oclif/plugin-update",
-  "version": "4.7.52",
+  "version": "4.7.54",
   "author": "Salesforce",
   "bugs": "https://github.com/oclif/plugin-update/issues",
   "dependencies": {
@@ -13,7 +13,7 @@
     "got": "^13",
     "proxy-agent": "^6.5.0",
     "semver": "^7.8.5",
-    "tar-fs": "^2.1.4"
+    "tar-fs": "^2.1.5"
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",
@@ -31,14 +31,14 @@
     "chai": "^4.5.0",
     "commitlint": "^19",
     "eslint": "^9.39.4",
-    "eslint-config-oclif": "^6.0.171",
+    "eslint-config-oclif": "^6.0.173",
     "eslint-config-prettier": "^10.1.8",
     "husky": "^9.1.7",
     "lint-staged": "^15",
     "mocha": "^11",
     "nock": "^13.5.6",
     "oclif": "^4",
-    "prettier": "^3.8.4",
+    "prettier": "^3.9.1",
     "shx": "^0.4.0",
     "sinon": "^18.0.1",
     "strip-ansi": "^7.2.0",