codify-plugin-lib 1.0.182-beta17 → 1.0.182-beta19

package/dist/pty/background-pty.js

@@ -86,7 +86,7 @@ export class BackgroundPty {
                         resolve(null);
                     }
                 });
-                console.log(`Running command ${cmd}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`);
+                console.log(`Running command: ${cmd}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`);
                 this.basePty.write(`${command}\r`);
             }));
         }).finally(async () => {

package/dist/utils/file-utils.d.ts

@@ -1,8 +1,8 @@
 export declare class FileUtils {
     static downloadFile(url: string, destination: string): Promise<void>;
-    static addToStartupFile(line: string): Promise<void>;
-    static addAllToStartupFile(lines: string[]): Promise<void>;
-    static addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void>;
+    static addToShellRc(line: string): Promise<void>;
+    static addAllToShellRc(lines: string[]): Promise<void>;
+    static addPathToShellRc(value: string, prepend: boolean): Promise<void>;
     static dirExists(path: string): Promise<boolean>;
     static fileExists(path: string): Promise<boolean>;
     static exists(path: string): Promise<boolean>;

package/dist/utils/file-utils.js

@@ -18,7 +18,7 @@ export class FileUtils {
         await finished(Readable.fromWeb(body).pipe(ws));
         console.log(`Finished downloading to ${destination}`);
     }
-    static async addToStartupFile(line) {
+    static async addToShellRc(line) {
         const lineToInsert = addLeadingSpacer(addTrailingSpacer(line));
         await fs.appendFile(Utils.getPrimaryShellRc(), lineToInsert);
         function addLeadingSpacer(line) {
@@ -32,14 +32,17 @@ export class FileUtils {
                 : line + '\n';
         }
     }
-    static async addAllToStartupFile(lines) {
+    static async addAllToShellRc(lines) {
         const formattedLines = '\n' + lines.join('\n') + '\n';
         const shellRc = Utils.getPrimaryShellRc();
         console.log(`Adding to ${path.basename(shellRc)}:
 ${lines.join('\n')}`);
         await fs.appendFile(shellRc, formattedLines);
     }
-    static async addPathToPrimaryShellRc(value, prepend) {
+    static async addPathToShellRc(value, prepend) {
+        if (!(await Utils.isDirectoryOnPath(value))) {
+            return;
+        }
         const shellRc = Utils.getPrimaryShellRc();
         console.log(`Saving path: ${value} to ${shellRc}`);
         if (prepend) {

package/dist/utils/index.d.ts

@@ -23,4 +23,5 @@ export declare const Utils: {
     getShell(): Shell | undefined;
     getPrimaryShellRc(): string;
     getShellRcFiles(): string[];
+    isDirectoryOnPath(directory: string): Promise<boolean>;
 };

package/dist/utils/index.js

@@ -1,5 +1,6 @@
 import os from 'node:os';
 import path from 'node:path';
+import { getPty } from '../pty/index.js';
 export function isDebug() {
     return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
 }
@@ -108,4 +109,10 @@ export const Utils = {
             path.join(homeDir, '.profile'),
         ];
     },
+    async isDirectoryOnPath(directory) {
+        const $ = getPty();
+        const { data: pathQuery } = await $.spawn('echo $PATH', { interactive: true });
+        const lines = pathQuery.split(':');
+        return lines.includes(directory);
+    },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codify-plugin-lib",
-  "version": "1.0.182-beta17",
+  "version": "1.0.182-beta19",
   "description": "Library plugin library",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/pty/background-pty.ts

@@ -104,7 +104,7 @@ export class BackgroundPty implements IPty {
           }
         });
 
-        console.log(`Running command ${cmd}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`)
+        console.log(`Running command: ${cmd}${options?.cwd ? ` (cwd: ${options.cwd})` : ''}`)
         this.basePty.write(`${command}\r`);
 
       }));

package/src/utils/file-utils.ts

@@ -25,7 +25,7 @@ export class FileUtils {
     console.log(`Finished downloading to ${destination}`);
   }
 
-  static async addToStartupFile(line: string): Promise<void> {
+  static async addToShellRc(line: string): Promise<void> {
     const lineToInsert = addLeadingSpacer(
       addTrailingSpacer(line)
     );
@@ -45,7 +45,7 @@ export class FileUtils {
     }
   }
 
-  static async addAllToStartupFile(lines: string[]): Promise<void> {
+  static async addAllToShellRc(lines: string[]): Promise<void> {
     const formattedLines = '\n' + lines.join('\n') + '\n';
     const shellRc = Utils.getPrimaryShellRc();
 
@@ -55,7 +55,11 @@ ${lines.join('\n')}`)
     await fs.appendFile(shellRc, formattedLines)
   }
 
-  static async addPathToPrimaryShellRc(value: string, prepend: boolean): Promise<void> {
+  static async addPathToShellRc(value: string, prepend: boolean): Promise<void> {
+    if (!(await Utils.isDirectoryOnPath(value))) {
+      return;
+    }
+
     const shellRc = Utils.getPrimaryShellRc();
     console.log(`Saving path: ${value} to ${shellRc}`);
 
@@ -124,7 +128,6 @@ ${lines.join('\n')}`)
     await fs.writeFile(filePath, newContents, 'utf8');
   }
 
-
   static async removeLineFromFile(filePath: string, search: RegExp | string): Promise<void> {
     const file = await fs.readFile(filePath, 'utf8')
     const lines = file.split('\n');

package/src/utils/index.ts

@@ -1,6 +1,7 @@
 import { OS } from 'codify-schemas';
 import os from 'node:os';
 import path from 'node:path';
+import { getPty } from '../pty/index.js';
 
 export function isDebug(): boolean {
   return process.env.DEBUG != null && process.env.DEBUG.includes('codify'); // TODO: replace with debug library
@@ -138,6 +139,13 @@ export const Utils = {
       path.join(homeDir, '.profile'),
     ];
   },
+
+  async isDirectoryOnPath(directory: string): Promise<boolean> {
+    const $ = getPty();
+    const { data: pathQuery } = await $.spawn('echo $PATH', { interactive: true });
+    const lines = pathQuery.split(':');
+    return lines.includes(directory);
+  },
 };