Merge branch 'master' into sophie-ai-images

1 files changed, 3 insertions, 3 deletions

diff --git a/src/server/ProcessFactory.ts b/src/server/ProcessFactory.ts
index 63682368f..f69eda4c3 100644
--- a/src/server/ProcessFactory.ts
+++ b/src/server/ProcessFactory.ts
@@ -2,7 +2,7 @@ import { ChildProcess, spawn, StdioOptions } from "child_process";
 import { existsSync, mkdirSync } from "fs";
 import { Stream } from "stream";
 import { fileDescriptorFromStream, pathFromRoot } from './ActionUtilities';
-import rimraf = require("rimraf");
+import { rimraf } from "rimraf";
 
 export namespace ProcessFactory {
 
@@ -13,7 +13,7 @@ export namespace ProcessFactory {
             const log_fd = await Logger.create(command, args);
             stdio = ["ignore", log_fd, log_fd];
         }
-        const child = spawn(command, args, { detached, stdio });
+        const child = spawn(command, args ?? [], { detached, stdio });
         child.unref();
         return child;
     }
@@ -27,7 +27,7 @@ export namespace Logger {
     export async function initialize() {
         if (existsSync(logPath)) {
             if (!process.env.SPAWNED) {
-                await new Promise<any>(resolve => rimraf(logPath, resolve));
+                await new Promise<any>(resolve => rimraf(logPath).then(resolve));
             }
         }
         mkdirSync(logPath);