From 8744cf94a55f27df0f0d63f1db52afb0b16d7333 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Fri, 19 Dec 2014 16:58:04 +0000
Subject: [PATCH] delete directory with rimraf

---
 services/filestore/app/coffee/FSPersistorManager.coffee | 9 +++++----
 services/filestore/package.json                         | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/services/filestore/app/coffee/FSPersistorManager.coffee b/services/filestore/app/coffee/FSPersistorManager.coffee
index cbdad516d6..1f2d64b8cb 100644
--- a/services/filestore/app/coffee/FSPersistorManager.coffee
+++ b/services/filestore/app/coffee/FSPersistorManager.coffee
@@ -1,6 +1,7 @@
 logger = require("logger-sharelatex")
 fs = require("fs")
 LocalFileWriter = require("./LocalFileWriter")
+rimraf = require("rimraf")
 
 filterName = (key) ->
   return key.replace /\//g, "_"
@@ -57,10 +58,10 @@ module.exports =
       callback err
 
   deleteDirectory: (location, name, callback = (err)->)->
-    filteredName = filterName name
-    fs.rmdir "#{location}/#{filteredName}", (err) ->
-      logger.err err:err, location:location, name:filteredName, "Error on rmdir."
-      if err and err.code != 'ENOENT' 
+    filteredName = filterName name.replace(/\/$/,'')
+    rimraf "#{location}/#{filteredName}", (err) ->
+      if err
+        logger.err err:err, location:location, name:filteredName, "Error on rimraf rmdir."
         callback err
       else
         callback()
diff --git a/services/filestore/package.json b/services/filestore/package.json
index be103715f7..c2fcaff080 100644
--- a/services/filestore/package.json
+++ b/services/filestore/package.json
@@ -21,6 +21,7 @@
     "node-uuid": "~1.4.1",
     "pngcrush": "0.0.3",
     "request": "2.14.0",
+    "rimraf": "2.2.8",
     "settings-sharelatex": "git+https://github.com/sharelatex/settings-sharelatex.git#master",
     "stream-buffers": "~0.2.5",
     "underscore": "~1.5.2"