check for update script + SD card size + uptime

checkupdate.sh

@@ -0,0 +1,36 @@
+#! /bin/bash
+
+# #################################################################################
+#
+# WebIndoor system script
+#       check for autoupdate
+#
+# #################################################################################
+
+
+## working repository
+if [ -z "$1" ]; then
+    REPO="inoteska"
+else
+    REPO="$1"
+fi
+
+
+## working dir
+cd /root/app
+
+
+VER_LOCAL=`git log -1 | grep commit | awk '{print $2}'`
+VER_REMOTE=`git ls-remote https://github.com/$REPO/indoorjs.git | grep HEAD | cut -f 1`
+
+if [ "$VER_LOCAL" == "$VER_REMOTE" ]
+then
+
+    echo "equal"
+
+else
+
+    echo "different"
+
+fi
+

lib/exec_process.js

@@ -12,13 +12,13 @@ var result = function(command, cb){
     });
     //console.log(child);
     child.on('close', function(code) {
-      console.log('child ended with: ' + code);
+//      console.log('child ended with: ' + code);
     });
     child.on('error', function(err) {
       console.log('child errd with: ' + err);
     });
     child.stdout.on('data', function(d) {
-      console.log('child stdout: ' + d);
+//      console.log('child stdout: ' + d);
    });
 }
 

public/app/app.js

@@ -423,7 +423,7 @@ app.controller('serviceCtrl', function ($scope, $rootScope, $location, services)
 	services.fullAppUpdate().then(function(data){
 	    $scope.msg = data.data;
 	}, function(err) {
-//	    console.log('restartApp:',err);
+//	    console.log('full app update:',err);
 	    $scope.msg = err;
 	    $location.path('/');
 	});
@@ -493,6 +493,8 @@ app.controller('mainCtrl', function ($scope, $rootScope, $location, services) {
 	$scope.webVer = VERSION_STR;
 	$scope.ip_addr = '?';
 	$scope.mac_addr = '?';
+	$scope.uptime = '?';
+	$scope.sdinfo = '?';
     };
 
     //**  */
@@ -513,6 +515,8 @@ app.controller('mainCtrl', function ($scope, $rootScope, $location, services) {
 		$scope.serverVer = d.serverVer;
 		$scope.ip_addr = d.ipaddr;//.split(' ',1)[0];
 		$scope.mac_addr = d.macaddr;
+		$scope.uptime = d.uptime;
+		$scope.sdinfo = d.sdcard;
 		for (var i = 0; i < d.lockFlag.length; i++) {
 		    if (d.lockFlag[i] != undefined) {
 			var l1 = Number('0x'+d.lockFlag[i]) & 0x0f,  l2 = (Number('0x'+d.lockFlag[i]) >> 4) & 0x0f;

public/views/about.html

@@ -35,6 +35,10 @@ <h3>Status</h3>
 	      <td>IP address</td><td>{{ip_addr}}</td>
 	      <td>MAC address</td><td>{{mac_addr}}</td>
 	    </tr>
+	    <tr>
+	      <td>Up time</td><td>{{uptime}}</td>
+	      <td>SD card size / available</td><td>{{sdinfo}}</td>
+	    </tr>
 	    <tr>
 	      <td colspan="4"> &nbsp; </td>
 	    </tr>
@@ -76,6 +80,7 @@ <h3>Status</h3>
         $('#statustable td:nth-child(odd)').css({'font-weight':'bold','font-size':'16px'});
         $('#statustable td:nth-child(even)').css({'font-size':'14px'});
         $('#statustable tr:first td').css({'font-weight':'bold','font-size':'20px'});
+	$('#statustable td').css({'white-space':'nowrap'});
 
     });
     </script>

server.js

@@ -50,6 +50,32 @@ function iniStatStruct() {
     appStatusStruct.rpiSN = store.get('system.rpi');
     appStatusStruct.lockFlag = ['?','?','?','?'];
     appStatusStruct.videoFlag = [];
+    appStatusStruct.sdcard = '?';
+    appStatusStruct.uptime = '?';
+
+    exec_process.result('df -h | grep /dev/root | awk \'{printf "%s / %s", $2, $4}\'',
+	function(err,res1){
+//	  console.log('res1:',res1);
+	  appStatusStruct.sdcard = res1;
+/*	  var sdinfo = res1.toString().split(' ');
+	  try {
+	  appStatusStruct.sdcard = sdinfo[1] + ' / ' + sdinfo[3];
+	  } catch(e) {
+	  appStatusStruct.sdcard = res1;
+	  }//*/
+	});
+
+    exec_process.result('uptime -p',
+	function(err,a){
+//	  console.log(a);
+	  var ut = a.toString().split(', ');
+	  try {
+	  appStatusStruct.uptime = ut[0] + ', ' + ut[1];
+	  } catch(e) {
+	  appStatusStruct.uptime = a;
+	  }
+	});
+
 }
 
 
@@ -359,7 +385,9 @@ var socketServer = net.createServer(function(c) {
 	    appStatusStruct.ipaddr = msg.substr('IPADDR: '.length);
 	} else
 	if (msg.indexOf('STRUCT:') == 0) {
-	    iniStatStruct();
+//	    iniStatStruct();
+
+//	    appStatusStruct.appConnectionFlag = 1;
 
 	    msg = msg.replace(/u\'/g, '\'');
 	    msg = msg.replace(/\'/g, '\"');		// "