aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorevansiroky <evan.siroky@yahoo.com>2020-10-18 17:49:45 -0700
committerevansiroky <evan.siroky@yahoo.com>2020-10-18 17:49:45 -0700
commitb0442caf358d2a813d8ae3bd2db8b5a99f2dadf8 (patch)
tree8ac20ddc45a2ceae590c3d480b965e514e0def68
parent7452c9b882c5ff0411be1882a2c13ba11c347859 (diff)
downloadtimezone-boundary-builder-b0442caf358d2a813d8ae3bd2db8b5a99f2dadf8.tar.gz
Make sure cleanup script deletes from downloads folder from cli args
-rw-r--r--index.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/index.js b/index.js
index 88a10c4..52ed37b 100644
--- a/index.js
+++ b/index.js
@@ -761,10 +761,6 @@ const autoScript = {
overallProgress.beginTask('Creating dist dir')
safeMkdir(distDir, cb)
},
- cleanDownloadsDir: ['makeDownloadsDir', function (results, cb) {
- overallProgress.beginTask('Cleaning downloads directory of unused files')
- cleanDownloadsDir(cb)
- }],
getOsmBoundaries: ['makeDownloadsDir', function (results, cb) {
overallProgress.beginTask('Downloading osm boundaries')
asynclib.eachSeries(Object.keys(osmBoundarySources), downloadOsmBoundary, cb)
@@ -772,13 +768,13 @@ const autoScript = {
cleanDownloadFolder: ['makeDistDir', 'getOsmBoundaries', function (results, cb) {
overallProgress.beginTask('cleanDownloadFolder')
const downloadedFilenames = Object.keys(osmBoundarySources).map(name => `${name}.json`)
- fs.readdir('downloads', (err, files) => {
+ fs.readdir(downloadsDir, (err, files) => {
if (err) return cb(err)
asynclib.each(
files,
(file, fileCb) => {
if (downloadedFilenames.indexOf(file) === -1) {
- return fs.unlink(path.join('downloads', file), fileCb)
+ return fs.unlink(path.join(downloadsDir, file), fileCb)
}
fileCb()
},