diff --git a/src/apptask.js b/src/apptask.js index 29b290265..b0062d7f8 100644 --- a/src/apptask.js +++ b/src/apptask.js @@ -37,7 +37,6 @@ var addons = require('./addons.js'), eventlog = require('./eventlog.js'), fs = require('fs'), manifestFormat = require('cloudron-manifestformat'), - mkdirp = require('mkdirp'), net = require('net'), os = require('os'), path = require('path'), @@ -176,7 +175,7 @@ function createAppDir(app, callback) { assert.strictEqual(typeof callback, 'function'); const appDir = path.join(paths.APPS_DATA_DIR, app.id); - mkdirp(appDir, function (error) { + fs.mkdir(appDir, { recursive: true }, function (error) { if (error) return callback(new BoxError(BoxError.FS_ERROR, `Error creating directory: ${error.message}`, { appDir })); callback(null); diff --git a/src/backups.js b/src/backups.js index 9ef96dd3c..636c78598 100644 --- a/src/backups.js +++ b/src/backups.js @@ -58,7 +58,6 @@ var addons = require('./addons.js'), fs = require('fs'), locker = require('./locker.js'), moment = require('moment'), - mkdirp = require('mkdirp'), once = require('once'), path = require('path'), paths = require('./paths.js'), @@ -681,7 +680,7 @@ function restoreFsMetadata(dataLayout, metadataFile, callback) { if (metadata === null) return callback(new BoxError(BoxError.EXTERNAL_ERROR, 'Error parsing fsmetadata.json:' + safe.error.message)); async.eachSeries(metadata.emptyDirs, function createPath(emptyDir, iteratorDone) { - mkdirp(dataLayout.toLocalPath(emptyDir), iteratorDone); + fs.mkdir(dataLayout.toLocalPath(emptyDir), { recursive: true }, iteratorDone); }, function (error) { if (error) return callback(new BoxError(BoxError.EXTERNAL_ERROR, `unable to create path: ${error.message}`)); @@ -713,7 +712,7 @@ function downloadDir(backupConfig, backupFilePath, dataLayout, progressCallback, } const destFilePath = dataLayout.toLocalPath('./' + relativePath); - mkdirp(path.dirname(destFilePath), function (error) { + fs.mkdir(path.dirname(destFilePath), { recursive: true }, function (error) { if (error) return done(new BoxError(BoxError.FS_ERROR, error.message)); async.retry({ times: 5, interval: 20000 }, function (retryCallback) { diff --git a/src/routes/test/settings-test.js b/src/routes/test/settings-test.js index fcaad7661..0e50e67a6 100644 --- a/src/routes/test/settings-test.js +++ b/src/routes/test/settings-test.js @@ -9,7 +9,7 @@ var async = require('async'), constants = require('../../constants.js'), database = require('../../database.js'), expect = require('expect.js'), - mkdirp = require('mkdirp'), + fs = require('fs'), rimraf = require('rimraf'), server = require('../../server.js'), superagent = require('superagent'); @@ -21,7 +21,7 @@ var BACKUP_FOLDER = '/tmp/backup_test'; var token = null; function setup(done) { - mkdirp.sync(BACKUP_FOLDER); + fs.mkdirSync(BACKUP_FOLDER, { recursive: true }); async.series([ server.start.bind(null), diff --git a/src/storage/filesystem.js b/src/storage/filesystem.js index 8912b4056..617596e3f 100644 --- a/src/storage/filesystem.js +++ b/src/storage/filesystem.js @@ -30,7 +30,6 @@ var assert = require('assert'), df = require('@sindresorhus/df'), EventEmitter = require('events'), fs = require('fs'), - mkdirp = require('mkdirp'), path = require('path'), prettyBytes = require('pretty-bytes'), readdirp = require('readdirp'), @@ -86,7 +85,7 @@ function upload(apiConfig, backupFilePath, sourceStream, callback) { assert.strictEqual(typeof sourceStream, 'object'); assert.strictEqual(typeof callback, 'function'); - mkdirp(path.dirname(backupFilePath), function (error) { + fs.mkdir(path.dirname(backupFilePath), { recursive: true }, function (error) { if (error) return callback(new BoxError(BoxError.EXTERNAL_ERROR, error.message)); safe.fs.unlinkSync(backupFilePath); // remove any hardlink @@ -168,7 +167,7 @@ function copy(apiConfig, oldFilePath, newFilePath) { var events = new EventEmitter(); - mkdirp(path.dirname(newFilePath), function (error) { + fs.mkdir(path.dirname(newFilePath), { recursive: true }, function (error) { if (error) return events.emit('done', new BoxError(BoxError.EXTERNAL_ERROR, error.message)); events.emit('progress', `Copying ${oldFilePath} to ${newFilePath}`); diff --git a/src/test/backups-test.js b/src/test/backups-test.js index ee7b7a0f9..6ae2d946c 100644 --- a/src/test/backups-test.js +++ b/src/test/backups-test.js @@ -16,7 +16,6 @@ var async = require('async'), expect = require('expect.js'), fs = require('fs'), os = require('os'), - mkdirp = require('mkdirp'), moment = require('moment'), path = require('path'), rimraf = require('rimraf'), @@ -139,7 +138,7 @@ describe('backups', function () { const BACKUP_DIR = path.join(os.tmpdir(), 'cloudron-backup-test'); async.series([ - mkdirp.bind(null, BACKUP_DIR), + fs.mkdir.bind(null, BACKUP_DIR, { recursive: true }), database.initialize, database._clear, settings.setBackupConfig.bind(null, { @@ -371,7 +370,7 @@ describe('backups', function () { }); it('succeeds to set backup config', function (done) { - mkdirp.sync(backupConfig.backupFolder); + fs.mkdirSync(backupConfig.backupFolder, { recursive: true }); settings.setBackupConfig(backupConfig, function (error) { expect(error).to.be(null); diff --git a/src/test/common.js b/src/test/common.js index 5ba5b60df..10ed74a2f 100644 --- a/src/test/common.js +++ b/src/test/common.js @@ -1,7 +1,6 @@ 'use strict'; var fs = require('fs'), - mkdirp = require('mkdirp'), path = require('path'), rimraf = require('rimraf'); @@ -11,7 +10,7 @@ exports = module.exports = { function createTree(root, obj) { rimraf.sync(root); - mkdirp.sync(root); + fs.mkdirSync(root, { recursive: true }); function createSubTree(tree, curpath) { for (var key in tree) { diff --git a/src/test/storage-test.js b/src/test/storage-test.js index a5cb1ad87..cfc8fc899 100644 --- a/src/test/storage-test.js +++ b/src/test/storage-test.js @@ -15,7 +15,6 @@ var BoxError = require('../boxerror.js'), os = require('os'), path = require('path'), rimraf = require('rimraf'), - mkdirp = require('mkdirp'), recursive_readdir = require('recursive-readdir'), s3 = require('../storage/s3.js'), gcs = require('../storage/gcs.js'), @@ -308,19 +307,19 @@ describe('Storage', function () { var GCSMockBasePath = path.join(os.tmpdir(), 'gcs-backup-test-buckets/'); before(function () { - var mockGCS = function(cfg){ - return {bucket: function(b){ + var mockGCS = function(){ + return {bucket: function(){ var file = function(filename){ var ensurePathWritable = function (filename) { filename = GCSMockBasePath + filename; - mkdirp.sync(path.dirname(filename)); + fs.mkdirSync(path.dirname(filename), { recursive: true }); return filename; }; return { name: filename, - createReadStream: function(cfg){ + createReadStream: function(){ return fs.createReadStream(ensurePathWritable(filename)) .on('error', function(e){ console.log('error createReadStream: '+filename); @@ -329,7 +328,7 @@ describe('Storage', function () { }) ; }, - createWriteStream: function(cfg){ + createWriteStream: function(){ return fs.createWriteStream(ensurePathWritable(filename)); }, delete: function(cb){ diff --git a/src/updater.js b/src/updater.js index 2c217fe33..6951c25a8 100644 --- a/src/updater.js +++ b/src/updater.js @@ -16,8 +16,8 @@ var apps = require('./apps.js'), debug = require('debug')('box:updater'), df = require('@sindresorhus/df'), eventlog = require('./eventlog.js'), + fs = require('fs'), locker = require('./locker.js'), - mkdirp = require('mkdirp'), os = require('os'), path = require('path'), paths = require('./paths.js'), @@ -121,7 +121,7 @@ function downloadAndVerifyRelease(updateInfo, callback) { downloadUrl.bind(null, updateInfo.sourceTarballUrl, `${paths.UPDATE_DIR}/box.tar.gz`), downloadUrl.bind(null, updateInfo.sourceTarballSigUrl, `${paths.UPDATE_DIR}/box.tar.gz.sig`), gpgVerify.bind(null, `${paths.UPDATE_DIR}/box.tar.gz`, `${paths.UPDATE_DIR}/box.tar.gz.sig`), - mkdirp.bind(null, newBoxSource), + fs.mkdir.bind(null, newBoxSource, { recursive: true }), extractTarball.bind(null, `${paths.UPDATE_DIR}/box.tar.gz`, newBoxSource) ], function (error) { if (error) return callback(error);