@noahyu/cd-cli 1.3.4 → 1.3.6

package/dist/src/index.js

@@ -145,15 +145,7 @@ async function deploy(config, version) {
         if (config.afterDeploy) {
             for (const cmd of config.afterDeploy) {
                 spinner.start(`执行部署后命令: ${cmd}`);
-                const wrappedCmd = [
-                    '[ -f /etc/profile ] && . /etc/profile 2>/dev/null || true',
-                    '[ -f ~/.bash_profile ] && . ~/.bash_profile 2>/dev/null || true',
-                    '[ -f ~/.bashrc ] && . ~/.bashrc 2>/dev/null || true',
-                    cmd,
-                ].join('; ');
-                const result = await ssh.execCommand(`bash -c ${JSON.stringify(wrappedCmd)}`, {
-                    cwd: config.server.deployPath,
-                });
+                const result = await execNodeCommand(ssh, cmd, { cwd: config.server.deployPath });
                 if (result.stdout) {
                     spinner.stop();
                     console.log(result.stdout);
@@ -191,12 +183,12 @@ async function deploy(config, version) {
             const { appName, restart = true } = config.pm2;
             if (restart) {
                 await new Promise((resolve) => setTimeout(resolve, 1000));
-                const result = await ssh.execCommand(`pm2 restart ${appName}`);
+                const result = await execNodeCommand(ssh, `pm2 restart ${appName}`);
                 if (result.code === 0) {
                     spinner.succeed('PM2 应用重启成功');
                 }
                 else {
-                    const startResult = await ssh.execCommand(`pm2 start ${appName}`);
+                    const startResult = await execNodeCommand(ssh, `pm2 start ${appName}`);
                     if (startResult.code === 0) {
                         spinner.succeed('PM2 应用启动成功');
                     }
@@ -513,7 +505,7 @@ async function performRollback(config, targetVersion, buildDirName) {
             spinner.start('正在重启 PM2 应用...');
             const { appName } = config.pm2;
             await new Promise((resolve) => setTimeout(resolve, 1000));
-            const result = await ssh.execCommand(`pm2 restart ${appName}`);
+            const result = await execNodeCommand(ssh, `pm2 restart ${appName}`);
             if (result.code === 0) {
                 spinner.succeed('PM2 应用重启成功');
             }
@@ -633,6 +625,16 @@ async function createSSHConnection(server) {
         throw new Error(`SSH 连接失败: ${error instanceof Error ? error.message : String(error)}`);
     }
 }
+async function execNodeCommand(ssh, cmd, options) {
+    const inner = [
+        'export PS1="x"',
+        '[ -f /etc/profile ] && . /etc/profile 2>/dev/null || true',
+        '[ -f ~/.bash_profile ] && . ~/.bash_profile 2>/dev/null || true',
+        '[ -f ~/.bashrc ] && . ~/.bashrc 2>/dev/null || true',
+        cmd,
+    ].join('; ');
+    return ssh.execCommand(`bash -l -c ${JSON.stringify(inner)}`, options);
+}
 async function cleanTempLinks(ssh, deployPath, buildDirName) {
     try {
         const result = await ssh.execCommand(`find ${deployPath} -name "${buildDirName}.tmp.*" -type l -delete`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noahyu/cd-cli",
-  "version": "1.3.4",
+  "version": "1.3.6",
   "description": "Global CLI tool for simple project deployment with version management",
   "type": "module",
   "main": "./dist/bin/cli.js",