From cd908a04331326dd8d889f07d5be2fc0df1d3622 Mon Sep 17 00:00:00 2001 From: Moe Date: Sun, 1 Jul 2018 15:49:26 -0700 Subject: [PATCH] disable Update button script only works from command line at the moment. --- camera.js | 7 +++++-- web/pages/super.ejs | 10 +++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/camera.js b/camera.js index 6888c684..9d26076a 100644 --- a/camera.js +++ b/camera.js @@ -4253,8 +4253,11 @@ var tx; switch(d.ff){ case'update': s.ffmpegKill() - s.systemLog('Shinobi ordered to update',{by:cn.mail,ip:cn.ip,distro:d.distro}) - var updateProcess = spawn('sh',(__dirname+'/UPDATE.sh '+d.distro).split(' '),{detached: true}) + s.systemLog('Shinobi ordered to update',{ + by:cn.mail, + ip:cn.ip + }) + var updateProcess = spawn('sh',(__dirname+'/UPDATE.sh').split(' '),{detached: true}) updateProcess.stderr.on('data',function(data){ s.systemLog('Update Info',data.toString()) }) diff --git a/web/pages/super.ejs b/web/pages/super.ejs index f2b905fa..c6c45992 100644 --- a/web/pages/super.ejs +++ b/web/pages/super.ejs @@ -142,11 +142,13 @@

<%-lang['Flush PM2 Logs']%>

+ @@ -434,13 +436,11 @@ $.system.e.find('[system]').click(function(e){ }); break; case'update': - e.distro=$(this).attr('distro') - if(!e.distro){e.distro='master'} $.confirm.e.modal('show') $.confirm.title.html('Update Shinobi?') - $.confirm.body.html('Updating Shinobi means overwriting files. If you have modified any files yourself you should update Shinobi manually. The updater will download the latest '+e.distro+' from the Pro repository.') + $.confirm.body.html('Updating Shinobi means overwriting files. If you have modified any files yourself you should update Shinobi manually.') $.confirm.click({title:'Update',class:'btn-danger'},function(){ - $.ccio.cx({f:'system',ff:'update',distro:e.distro}) + $.ccio.cx({f:'system',ff:'update'}) }); break; }