Duplicate remover name change, merge.sh adjust

This commit is contained in:
MrFry 2020-03-26 15:08:55 +01:00
parent 1280af95a8
commit 6b439cf7fb
2 changed files with 4 additions and 3 deletions

View file

@ -7,6 +7,6 @@ node $p/utils/rmDuplicates.js /tmp/data.json 2> /dev/null
mkdir -p "$p/public/backs/" mkdir -p "$p/public/backs/"
mv -v $p/public/data.json "$p/public/backs/data.json $(date)" 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 echo Done

View file

@ -23,6 +23,7 @@ const classes = require('./question-classes/classes.js')
const actions = require('./actions.js') const actions = require('./actions.js')
const logger = require('./logger.js') const logger = require('./logger.js')
const resultFileName = 'res.json'
const minMatchAmmount = 100 const minMatchAmmount = 100
const logPath = './mergeLogs/mergelog_' + GetDateString().replace(/ /g, '_') const logPath = './mergeLogs/mergelog_' + GetDateString().replace(/ /g, '_')
@ -51,8 +52,8 @@ function Main () {
PrintDB(res) PrintDB(res)
console.log(hr('=')) console.log(hr('='))
utils.WriteFile(JSON.stringify(res), 'res.json') utils.WriteFile(JSON.stringify(res), resultFileName)
console.log(C('green') + 'res.json written!' + C()) console.log(C('green') + resultFileName + ' written!' + C())
console.log(hr('=')) console.log(hr('='))
console.log(C('green') + 'Done' + C()) console.log(C('green') + 'Done' + C())