Skip to content

Commit 7154fa4

Browse files
committed
centralize util for making an empty directory
1 parent 80d614e commit 7154fa4

File tree

2 files changed

+36
-27
lines changed

2 files changed

+36
-27
lines changed

tasks/empty_dist.js

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,13 @@
1-
var path = require('path');
2-
var fs = require('fs-extra');
3-
var common = require('./util/common');
41
var constants = require('./util/constants');
2+
var makeEmptyDirectory = require('./util/make_empty_directory');
3+
var emptyDir = makeEmptyDirectory.emptyDir;
4+
var makeDir = makeEmptyDirectory.makeDir;
55

66
var dist = constants.pathToDist; // dist
77
var distTopojson = constants.pathToTopojsonDist; // dist/topojson
8+
89
// main
910
emptyDir(distTopojson);
1011
emptyDir(dist);
1112
makeDir(dist);
1213
makeDir(distTopojson);
13-
14-
function emptyDir(dir) {
15-
if(common.doesDirExist(dir)) {
16-
console.log('empty ' + dir);
17-
try {
18-
var allFiles = fs.readdirSync(dir);
19-
allFiles.forEach(function(file) {
20-
// remove file
21-
fs.unlinkSync(path.join(dir, file));
22-
});
23-
24-
fs.rmdirSync(dir);
25-
} catch(err) {
26-
console.error(err);
27-
}
28-
}
29-
}
30-
31-
function makeDir(dir) {
32-
if(!common.doesDirExist(dir)) {
33-
// create folder
34-
fs.mkdirSync(dir);
35-
}
36-
}

tasks/util/make_empty_directory.js

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
var path = require('path');
2+
var fs = require('fs-extra');
3+
var common = require('./common');
4+
5+
module.exports = {
6+
emptyDir: emptyDir,
7+
makeDir: makeDir
8+
};
9+
10+
function emptyDir(dir) {
11+
if(common.doesDirExist(dir)) {
12+
console.log('empty ' + dir);
13+
try {
14+
var allFiles = fs.readdirSync(dir);
15+
allFiles.forEach(function(file) {
16+
// remove file
17+
fs.unlinkSync(path.join(dir, file));
18+
});
19+
20+
fs.rmdirSync(dir);
21+
} catch(err) {
22+
console.error(err);
23+
}
24+
}
25+
}
26+
27+
function makeDir(dir) {
28+
if(!common.doesDirExist(dir)) {
29+
// create folder
30+
fs.mkdirSync(dir);
31+
}
32+
}

0 commit comments

Comments
 (0)