From 6b439cf7fb11dc35b20b45156b358734d7ed55b7 Mon Sep 17 00:00:00 2001 From: MrFry Date: Thu, 26 Mar 2020 15:08:55 +0100 Subject: [PATCH] Duplicate remover name change, merge.sh adjust --- utils/merge.sh | 2 +- utils/rmDuplicates.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/merge.sh b/utils/merge.sh index f76e26f..fe0abfb 100755 --- a/utils/merge.sh +++ b/utils/merge.sh @@ -7,6 +7,6 @@ node $p/utils/rmDuplicates.js /tmp/data.json 2> /dev/null mkdir -p "$p/public/backs/" mv -v $p/public/data.json "$p/public/backs/data.json $(date)" -mv -v $p/utils/newData $p/public/data.json +mv -v $p/utils/res.json $p/public/data.json echo Done diff --git a/utils/rmDuplicates.js b/utils/rmDuplicates.js index 3e47ce2..ab540e1 100644 --- a/utils/rmDuplicates.js +++ b/utils/rmDuplicates.js @@ -23,6 +23,7 @@ const classes = require('./question-classes/classes.js') const actions = require('./actions.js') const logger = require('./logger.js') +const resultFileName = 'res.json' const minMatchAmmount = 100 const logPath = './mergeLogs/mergelog_' + GetDateString().replace(/ /g, '_') @@ -51,8 +52,8 @@ function Main () { PrintDB(res) console.log(hr('=')) - utils.WriteFile(JSON.stringify(res), 'res.json') - console.log(C('green') + 'res.json written!' + C()) + utils.WriteFile(JSON.stringify(res), resultFileName) + console.log(C('green') + resultFileName + ' written!' + C()) console.log(hr('=')) console.log(C('green') + 'Done' + C())