update archive dependecy

fixes: #1930
adaptlearning · Apr 4, 2018 · cec3f05 · cec3f05
1 parent d7a5ae7
commit cec3f05
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -39,7 +39,7 @@
     "Nicola Willis <nicola.willis@canstudios.com>"
   ],
   "dependencies": {
-    "archiver": "~0.16.0",
+    "archiver": "2.1.1",
     "async": "2.5.0",
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.13.3",

diff --git a/plugins/output/adapt/index.js b/plugins/output/adapt/index.js
@@ -244,11 +244,7 @@ AdaptOutput.prototype.publish = function(courseId, mode, request, response, next
           });
 
           archive.pipe(output);
-
-          archive.bulk([
-            { expand: true, cwd: path.join(BUILD_FOLDER), src: ['**/*'] },
-          ]).finalize();
-
+          archive.glob('**/*', {cwd: path.join(BUILD_FOLDER)}).finalize();
         } else {
           // No download required -- skip this step
           callback();
@@ -331,7 +327,7 @@ AdaptOutput.prototype.export = function (courseId, request, response, next) {
       archive.on('error', callback);
       output.on('close', callback);
       archive.pipe(output);
-      archive.bulk([{ expand: true, cwd: exportDir, src: ['**/*'] }]).finalize();
+      archive.glob('**/*', {cwd: exportDir}).finalize();
     }
   ],
   function onDone(asyncError) {