diff --git a/debugger/src/templates/bat-template b/debugger/src/templates/bat-template index 1c21cf7bd..d187f5573 100644 --- a/debugger/src/templates/bat-template +++ b/debugger/src/templates/bat-template @@ -122,7 +122,7 @@ if defined DAFFODIL_DEBUG_CLASSPATH ( rem Call the application and pass all arguments unchanged. -"%_JAVACMD%" !_JAVA_OPTS! !DAFFODIL_DEBUGGER_OPTS! -cp "%NEW_CLASSPATH%" %MAIN_CLASS% !_APP_ARGS! +"%_JAVACMD%" !_JAVA_OPTS! !DAFFODIL_DEBUGGER_OPTS! -cp %NEW_CLASSPATH% %MAIN_CLASS% !_APP_ARGS! @endlocal diff --git a/src/dataEditor/dataEditorClient.ts b/src/dataEditor/dataEditorClient.ts index ac65eaf9c..09ed99f4f 100644 --- a/src/dataEditor/dataEditorClient.ts +++ b/src/dataEditor/dataEditorClient.ts @@ -1317,6 +1317,11 @@ async function serverStart() { throw new Error(`Log config file '${logConfigFile}' not found`) } + const x = OMEGA_EDIT_HOST + const y = getPidFile(omegaEditPort) + const z = logConfigFile + + console.log(x, y, z) // Start the server and wait up to 10 seconds for it to start const serverPid = (await Promise.race([ startServer( diff --git a/src/utils.ts b/src/utils.ts index 735d58a71..330345971 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -296,11 +296,10 @@ export async function runScript( const terminal = getTerminal(hideTerminal, env, createTerminal) // Create debugger run command - const fullPathToScript = path - .join(scriptPath, 'bin', scriptName) - // fix pathing as emtpy space needs a \ before it to not cause errors - .replace(' ', '\\ ') - const debuggerRunCommand = `${fullPathToScript} ${shellArgs.join(' ')}` + const fullPathToScript = path.join(scriptPath, 'bin', scriptName) + + // Surround path to script with quotes to account for spaces + const debuggerRunCommand = `"${fullPathToScript}" ${shellArgs.join(' ')}` // Send debugger run command to terminal, when exists terminal will stay open terminal.sendText(debuggerRunCommand)