From 254cc34daf9f9a1a54dbccf901fcd66cfbc4174d Mon Sep 17 00:00:00 2001 From: choibk Date: Sun, 25 Jan 2026 02:04:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=95=88=EC=A0=95=ED=99=94:=20?= =?UTF-8?q?=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=8B=A4=ED=96=89=EB=A0=A5=20=EA=B0=95?= =?UTF-8?q?=ED=99=94=20=EB=B0=8F=20=EC=9C=88=EB=8F=84=EC=9A=B0=20=ED=98=B8?= =?UTF-8?q?=ED=99=98=EC=84=B1=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- server/routes/system.js | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 21375aa..02c35c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "smartims", - "version": "0.1.0", + "version": "0.4.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "smartims", - "version": "0.1.0", + "version": "0.4.0.0", "dependencies": { "@dnd-kit/core": "^6.3.1", "@dnd-kit/sortable": "^10.0.0", diff --git a/server/routes/system.js b/server/routes/system.js index cbfde67..5abe246 100644 --- a/server/routes/system.js +++ b/server/routes/system.js @@ -590,10 +590,12 @@ router.post('/version/update', isAuthenticated, hasRole('admin'), async (req, re authPrefix = `git remote set-url origin ${auth.url} && `; } - const updateScript = `${authPrefix} git fetch --tags --force && git checkout -f ${targetTag} && npm install && npm run build && cd server && npm install && pm2 reload smartims-api`; + // Build a more robust update script + // On dev environments, pm2 might fail, so we make it optional (|| echo) + const updateScript = isWindows + ? `${authPrefix} git fetch --tags --force && git checkout -f ${targetTag} && npm install && npm run build` + : `${authPrefix} git fetch --tags --force && git checkout -f ${targetTag} && npm install && npm run build && cd server && npm install && pm2 reload smartims-api || echo "PM2 not found, skipping reload"`; - // Note: On Windows, use cmd.exe /c which supports '&&' better than default PowerShell - const isWindows = process.platform === 'win32'; const shellCommand = isWindows ? `cmd.exe /c "${updateScript}"` : updateScript; console.log(`🚀 Starting system update to ${targetTag}...`);