Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 8 additions and 2 deletions
Showing only changes of commit 9c0ca37481 - Show all commits

View File

@ -348,14 +348,20 @@ function rUpdate (req, res, next) {
exec('sh ./scripts/update.sh', (err, stdio, stderr) => { exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
res.send({ success : true, action : 'update' }) res.send({ success : true, action : 'update' })
res.end() res.end()
process.exit(0) next()
setTimeout(() => {
process.exit(0)
}, 100)
}) })
} }
function rRestart (req, res, next) { function rRestart (req, res, next) {
res.send({ success : true, action : 'restart' }) res.send({ success : true, action : 'restart' })
res.end() res.end()
process.exit(0) next()
setTimeout(() => {
process.exit(0)
}, 100)
} }
//Ble functions //Ble functions