From b9ca80873fdfb3c0e2b48ee715e9cbc4ff968aba Mon Sep 17 00:00:00 2001 From: Sam Wilkins Date: Sat, 14 Dec 2019 12:09:05 -0500 Subject: update --- src/server/session_manager/session_manager.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/session_manager/session_manager.ts b/src/server/session_manager/session_manager.ts index 37b32d621..d5ef94dc7 100644 --- a/src/server/session_manager/session_manager.ts +++ b/src/server/session_manager/session_manager.ts @@ -36,7 +36,10 @@ registerCommand("update", [], async () => { identifiedLog(cyan("Initializing server update from version control...")); await endPrevious(); await new Promise(resolve => { - exec("git pull && npm install", () => { + exec(updateCommand(), error => { + if (error) { + identifiedLog(red(error.message)); + } resolve(); }); }); @@ -68,6 +71,13 @@ if (!["win32", "darwin"].includes(process.platform)) { process.exit(1); } +function updateCommand() { + if (onWindows) { + return '"C:\\Program Files\\Git\\git-bash.exe" -c "git pull && npm install"'; + } + return `osascript -e 'tell app "Terminal"\ndo script "cd ${pathFromRoot()} && git pull && npm install"\nend tell'`; +} + function startServerCommand() { if (onWindows) { return '"C:\\Program Files\\Git\\git-bash.exe" -c "npm run start-release"'; -- cgit v1.2.3-70-g09d2