fix log path on Windows, log command executions

jupyterlab · Oct 3, 2023 · 532213b · 532213b
1 parent 370a7ef
commit 532213b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/cli.ts b/src/main/cli.ts
@@ -457,13 +457,18 @@ export async function runCommandInEnvironment(
           env: process.env
         })
       : spawn('bash', ['-c', commandScript], {
-          stdio: 'inherit',
           env: {
             ...process.env,
             BASH_SILENCE_DEPRECATION_WARNING: '1'
           }
         });
 
+    if (shell.stdout) {
+      shell.stdout.on('data', chunk => {
+        console.debug('>', Buffer.from(chunk).toString());
+      });
+    }
+
     shell.on('close', code => {
       if (code !== 0) {
         console.error('Shell exit with code:', code);

diff --git a/src/main/utils.ts b/src/main/utils.ts
@@ -514,10 +514,7 @@ export function createUnsignScriptInEnv(envPath: string): string {
 export function getLogFilePath(processType: 'main' | 'renderer' = 'main') {
   switch (process.platform) {
     case 'win32':
-      return path.join(
-        getUserDataDir(),
-        `\\jupyterlab-desktop\\logs\\${processType}.log`
-      );
+      return path.join(getUserDataDir(), `\\logs\\${processType}.log`);
     case 'darwin':
       return path.join(
         getUserHomeDir(),