Push dev work to master #2

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

View File

@ -521,7 +521,9 @@ function seq () {
} }
function update (req, res, next) { function update (req, res, next) {
exec('sh ./scripts/update.sh') exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
process.exit()
})
} }
function index (req, res, next) { function index (req, res, next) {

View File

@ -2,6 +2,4 @@
sudo -u pi -i<< EOF sudo -u pi -i<< EOF
cd /home/pi/intval3 && git pull cd /home/pi/intval3 && git pull
EOF EOF
cd /home/pi/intval3 && sudo pm2 restart process.json