Merge branch 'master' into sophie-ai-images

1 files changed, 6 insertions, 4 deletions

diff --git a/src/server/ActionUtilities.ts b/src/server/ActionUtilities.ts
index bc8fd6f87..55b50cc12 100644
--- a/src/server/ActionUtilities.ts
+++ b/src/server/ActionUtilities.ts
@@ -4,9 +4,9 @@ import { createWriteStream, exists, mkdir, readFile, unlink, writeFile } from 'f
 import * as nodemailer from "nodemailer";
 import { MailOptions } from "nodemailer/lib/json-transport";
 import * as path from 'path';
-import * as rimraf from "rimraf";
+import { rimraf } from "rimraf";
 import { ExecOptions } from 'shelljs';
-import Mail = require('nodemailer/lib/mailer');
+import * as Mail from 'nodemailer/lib/mailer';
 
 const projectRoot = path.resolve(__dirname, "../../");
 export function pathFromRoot(relative?: string) {
@@ -103,8 +103,10 @@ export const createIfNotExists = async (path: string) => {
 };
 
 export async function Prune(rootDirectory: string): Promise<boolean> {
-    const error = await new Promise<Error>(resolve => rimraf(rootDirectory, resolve));
-    return error === null;
+    // const error =  await new Promise<Error>(resolve => rimraf(rootDirectory).then(resolve));
+    await new Promise<void>(resolve => rimraf(rootDirectory).then(() => resolve()));
+    // return error === null;
+    return true;
 }
 
 export const Destroy = (mediaPath: string) => new Promise<boolean>(resolve => unlink(mediaPath, error => resolve(error === null)));