fix: fixed codify edit desktop installation. Fixed apply message

Author: kevinwang5658

package-lock.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "@codifycli/ink-form": "0.0.12",
     "@codifycli/schemas": "1.1.0-beta8",
-    "@homebridge/node-pty-prebuilt-multiarch": "^0.12.0-beta.5",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.13.1",
     "@mischnic/json-sourcemap": "^0.1.1",
     "@oclif/core": "^4.0.8",
     "@oclif/plugin-autocomplete": "^3.2.24",
@@ -145,7 +145,7 @@
     "deploy": "npm run pkg && npm run notarize && npm run upload",
     "prepublishOnly": "npm run build"
   },
-  "version": "1.1.0",
+  "version": "1.1.1-beta.6",
   "bugs": "https://github.com/codifycli/codify/issues",
   "keywords": [
     "oclif",

package.json

@@ -1,11 +1,13 @@
 import { ResourceOperation } from '@codifycli/schemas';
 import { Box, Text } from 'ink';
+import path from 'node:path';
 import React from 'react';
 
 import { ApplyResult } from '../../../entities/apply-result.js';
 import { ResourcePlan } from '../../../entities/plan.js';
 import { applyEntryInkColor, applyEntryLabel } from '../../apply-result-formatter.js';
 import { prettyFormatResourcePlan } from '../../plan-pretty-printer.js';
+import { ShellUtils } from '../../../utils/shell.js';
 
 export function ApplyComplete({ result }: { result: ApplyResult }) {
   const isPartial = result.isPartialFailure();
@@ -93,7 +95,7 @@ export function ApplyComplete({ result }: { result: ApplyResult }) {
 
       {!isPartial && (
         <Box marginTop={1}>
-          <Text dimColor>Open a new terminal or source &apos;.zshrc&apos; for the new changes to be reflected</Text>
+          <Text dimColor>Open a new terminal or source &apos;{path.basename(ShellUtils.getPrimaryShellRc())}&apos; for the new changes to be reflected</Text>
         </Box>
       )}
 

src/ui/components/widgets/ApplyComplete.tsx

@@ -9,7 +9,7 @@ import { spawn } from './spawn.js';
 
 const DESKTOP_APP_PATHS = {
   darwin: '/Applications/Codify.app',
-  linux: '/usr/bin/codify',
+  linux: '/usr/bin/codify-desktop',
 };
 
 const DOWNLOAD_URLS: Record<string, Record<string, string>> = {
@@ -86,7 +86,7 @@ export async function installDesktopApp(reporter: Reporter, url: string, platfor
     }
   } else {
     const password = await reporter.promptSudo('codify-installer', {
-      command: platform === 'linux_deb' ? `dpkg -i ${tmpFile}` : `rpm -i ${tmpFile}`,
+      command: platform === 'linux_deb' ? `apt install -y ${tmpFile}` : `rpm -i ${tmpFile}`,
       options: { requiresRoot: true },
     });
 
@@ -97,12 +97,22 @@ export async function installDesktopApp(reporter: Reporter, url: string, platfor
 
     try {
       console.log('Installing Codify desktop app...');
-      const cmd = platform === 'linux_deb' ? `dpkg -i ${tmpFile}` : `rpm -i ${tmpFile}`;
-      await spawn(cmd, { requiresRoot: true }, undefined, password);
+      const cmd = platform === 'linux_deb' ? `apt install -y ${tmpFile}` : `rpm -i ${tmpFile}`;
+      try {
+        await spawn(cmd, { requiresRoot: true }, undefined, password);
+      } catch (e) {
+        if (platform === 'linux_deb') {
+          console.log('Fixing broken dependencies...');
+          await spawn('apt-get install -f -y', { requiresRoot: true }, undefined, password);
+          await spawn(cmd, { requiresRoot: true }, undefined, password);
+        } else {
+          throw e;
+        }
+      }
     } finally {
       await fs.unlink(tmpFile).catch(() => {});
     }
   }
 
   console.log('Codify desktop app installed successfully.');
-}
+}

src/utils/desktop-installer.ts

@@ -2,6 +2,8 @@ import { LinuxDistro } from '@codifycli/schemas';
 import cp from 'node:child_process';
 import * as fs from 'node:fs/promises';
 import util from 'node:util';
+import os from 'node:os';
+import path from 'node:path';
 
 const exec = util.promisify(cp.exec);
 
@@ -50,6 +52,82 @@ export const ShellUtils = {
     return process.env.SHELL!;
   },
 
+  getPrimaryShellRc(): string {
+    return this.getShellRcFiles()[0];
+  },
+
+  getShellRcFiles(): string[] {
+    const shell = process.env.SHELL || os.userInfo().shell || '';
+    const homeDir = os.homedir();
+
+    if (shell.endsWith('bash')) {
+      // Linux typically uses .bashrc, macOS uses .bash_profile
+      if (ShellUtils.isLinux()) {
+        return [
+          path.join(homeDir, '.bashrc'),
+          path.join(homeDir, '.bash_profile'),
+          path.join(homeDir, '.profile'),
+        ];
+      }
+
+      return [
+        path.join(homeDir, '.bash_profile'),
+        path.join(homeDir, '.bashrc'),
+        path.join(homeDir, '.profile'),
+      ];
+    }
+
+    if (shell.endsWith('zsh')) {
+      return [
+        path.join(homeDir, '.zshrc'),
+        path.join(homeDir, '.zprofile'),
+        path.join(homeDir, '.zshenv'),
+      ];
+    }
+
+    if (shell.endsWith('sh')) {
+      return [
+        path.join(homeDir, '.profile'),
+      ]
+    }
+
+    if (shell.endsWith('ksh')) {
+      return [
+        path.join(homeDir, '.profile'),
+        path.join(homeDir, '.kshrc'),
+      ]
+    }
+
+    if (shell.endsWith('csh')) {
+      return [
+        path.join(homeDir, '.cshrc'),
+        path.join(homeDir, '.login'),
+        path.join(homeDir, '.logout'),
+      ]
+    }
+
+    if (shell.endsWith('fish')) {
+      return [
+        path.join(homeDir, '.config/fish/config.fish'),
+      ]
+    }
+
+    // Default to bash-style files
+    return [
+      path.join(homeDir, '.bashrc'),
+      path.join(homeDir, '.bash_profile'),
+      path.join(homeDir, '.profile'),
+    ];
+  },
+
+  isMacOS(): boolean {
+    return os.platform() === 'darwin';
+  },
+
+  isLinux(): boolean {
+    return os.platform() === 'linux';
+  },
+
   async getLinuxDistro(): Promise<LinuxDistro | undefined> {
     for (const candidate of ['/etc/os-release', '/usr/lib/os-release']) {
       let osRelease: string;