Move the various scripts into a dedicated folder

scripts/check-account-deletion.js

@@ -54,7 +54,7 @@ let data = [];
 let pinned = [];
 
 nThen((waitFor) => {
-    let f = './pins/' + edPublic.slice(0, 2) + '/' + edPublic + '.ndjson';
+    let f = '../pins/' + edPublic.slice(0, 2) + '/' + edPublic + '.ndjson';
     Fs.readFile(f, waitFor((err, content) => {
         if (err) { throw err; }
         pinned = hashesFromPinFile(content.toString('utf8'), f);

scripts/check-accounts.js

@@ -1,7 +1,7 @@
 /* globals Buffer */
 var Https = require('https');
-var Config = require("./config.js");
-var Package = require("./package.json");
+var Config = require("../config/config.js");
+var Package = require("../package.json");
 
 var body = JSON.stringify({
     domain: Config.myDomain,

scripts/delete-inactive.js

@@ -5,9 +5,9 @@ const Saferphore = require("saferphore");
 const PinnedData = require('./pinneddata');
 let config;
 try {
-    config = require('./config');
+    config = require('../config/config');
 } catch (e) {
-    config = require('./config.example');
+    config = require('../config/config.example');
 }
 
 if (!config.inactiveTime || typeof(config.inactiveTime) !== "number") { return; }

scripts/expire-channels.js

@@ -5,13 +5,13 @@ var nThen = require("nthen");
 
 var config;
 try {
-    config = require('./config');
+    config = require('../config/config');
 } catch (e) {
-    config = require('./config.example');
+    config = require('../config/config.example');
 }
 
-var FileStorage = require(config.storage || './storage/file');
-var root = Path.resolve(config.taskPath || './tasks');
+var FileStorage = require('../' + config.storage || './storage/file');
+var root = Path.resolve('../' + config.taskPath || './tasks');
 
 var dirs;
 var nt;

scripts/pinned.js

@@ -35,7 +35,7 @@ const hashesFromPinFile = (pinFile, fileName) => {
 
 module.exports.load = function (cb, config) {
     nThen((waitFor) => {
-        Fs.readdir('./pins', waitFor((err, list) => {
+        Fs.readdir('../pins', waitFor((err, list) => {
             if (err) {
                 if (err.code === 'ENOENT') {
                     dirList = [];
@@ -48,11 +48,11 @@ module.exports.load = function (cb, config) {
     }).nThen((waitFor) => {
         dirList.forEach((f) => {
             sema.take((returnAfter) => {
-                Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => {
+                Fs.readdir('../pins/' + f, waitFor(returnAfter((err, list2) => {
                     if (err) { throw err; }
                     list2.forEach((ff) => {
                         if (config && config.exclude && config.exclude.indexOf(ff) > -1) { return; }
-                        fileList.push('./pins/' + f + '/' + ff);
+                        fileList.push('../pins/' + f + '/' + ff);
                     });
                 })));
             });

scripts/pinneddata.js

@@ -65,7 +65,7 @@ const pinned = {}; // map of pinned files
 module.exports.load = function (config, cb) {
     nThen((waitFor) => {
         // read the subdirectories in the datastore
-        Fs.readdir('./datastore', waitFor((err, list) => {
+        Fs.readdir('../datastore', waitFor((err, list) => {
             if (err) { throw err; }
             dirList = list;
         }));
@@ -76,15 +76,15 @@ module.exports.load = function (config, cb) {
             sema.take((returnAfter) => {
                 // get the list of files in every subdirectory
                 // and push them to 'fileList'
-                Fs.readdir('./datastore/' + f, waitFor(returnAfter((err, list2) => {
+                Fs.readdir('../datastore/' + f, waitFor(returnAfter((err, list2) => {
                     if (err) { throw err; }
-                    list2.forEach((ff) => { fileList.push('./datastore/' + f + '/' + ff); });
+                    list2.forEach((ff) => { fileList.push('../datastore/' + f + '/' + ff); });
                 })));
             });
         });
     }).nThen((waitFor) => {
         // read the subdirectories in 'blob'
-        Fs.readdir('./blob', waitFor((err, list) => {
+        Fs.readdir('../blob', waitFor((err, list) => {
             if (err) { throw err; }
             // overwrite dirList
             dirList = list;
@@ -96,9 +96,9 @@ module.exports.load = function (config, cb) {
             sema.take((returnAfter) => {
                 // get the list of files in every subdirectory
                 // and push them to 'fileList'
-                Fs.readdir('./blob/' + f, waitFor(returnAfter((err, list2) => {
+                Fs.readdir('../blob/' + f, waitFor(returnAfter((err, list2) => {
                     if (err) { throw err; }
-                    list2.forEach((ff) => { fileList.push('./blob/' + f + '/' + ff); });
+                    list2.forEach((ff) => { fileList.push('../blob/' + f + '/' + ff); });
                 })));
             });
         });
@@ -118,7 +118,7 @@ module.exports.load = function (config, cb) {
         });
     }).nThen((waitFor) => {
         // read the subdirectories in the pinstore
-        Fs.readdir('./pins', waitFor((err, list) => {
+        Fs.readdir('../pins', waitFor((err, list) => {
             if (err) { throw err; }
             dirList = list;
         }));
@@ -131,9 +131,9 @@ module.exports.load = function (config, cb) {
             sema.take((returnAfter) => {
                 // get the list of files in every subdirectory
                 // and push them to 'fileList' (which is empty because we keep reusing it)
-                Fs.readdir('./pins/' + f, waitFor(returnAfter((err, list2) => {
+                Fs.readdir('../pins/' + f, waitFor(returnAfter((err, list2) => {
                     if (err) { throw err; }
-                    list2.forEach((ff) => { fileList.push('./pins/' + f + '/' + ff); });
+                    list2.forEach((ff) => { fileList.push('../pins/' + f + '/' + ff); });
                 })));
             });
         });