Merge branch 'master' of https://github.com/hopglass/hopglass-server

Author: Milan Pssler

modules/receiver/announced.js

@@ -55,17 +55,21 @@ module.exports = function(receiverId, configData, api) {
       if (err) {
         console.log('ERR: ' + err)
       } else {
-        var obj = JSON.parse(res)
-        var id
-        if (obj.nodeinfo) {
-          id = obj.nodeinfo.node_id
-        } else if (obj.statistics) {
-          id = obj.statistics.node_id
-        } else if (obj.neighbours) {
-          id = obj.neighbours.node_id
-        } else return
-
-        api.receiverCallback(id, obj, receiverId)
+        try {
+          var obj = JSON.parse(res)
+          var id
+          if (obj.nodeinfo) {
+            id = obj.nodeinfo.node_id
+          } else if (obj.statistics) {
+            id = obj.statistics.node_id
+          } else if (obj.neighbours) {
+            id = obj.neighbours.node_id
+          } else return
+          api.receiverCallback(id, obj, receiverId)
+        }
+        catch (err) {
+          console.log('JSON.parse ERROR! ' + err)
+        }
       }
     })
   })

scripts/bootstrap.sh

@@ -74,11 +74,12 @@ function prereq {
 
     if curl -f "https://deb.nodesource.com/node_6.x/dists/$DISTRO/Release" >/dev/null
     then
-      apt-get remove nodejs nodejs-legacy npm -y
       curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
       echo "deb https://deb.nodesource.com/node_6.x $DISTRO main" > /etc/apt/sources.list.d/nodesource.list
       echo "deb-src https://deb.nodesource.com/node_6.x $DISTRO main" >> /etc/apt/sources.list.d/nodesource.list
       apt-get update
+      # comment out the following line, if you installed nodejs 6 already (check with `apt-cache policy nodejs`)
+      apt-get remove nodejs nodejs-legacy npm
       apt-get install nodejs git -y
     else
       END_NOTICE="$END_NOTICE\nYour distribution is not supported by NodeJS. \nYou have to install a recent NodeJS version (>=4) manually. "
@@ -105,13 +106,12 @@ function prereq {
 
 function install {
   #Clone and install NodeJS libs
-  su - hopglass --shell /bin/bash <<'EOF'
-  git clone https://github.com/hopglass/hopglass-server -b v0.1.1 server
-  cd server
-  npm install
-  exit
-EOF
-#EOF can't be indented
+  su - hopglass --shell /bin/bash <<-EOF
+    git clone https://github.com/hopglass/hopglass-server -b v0.1.1 server
+    cd server
+    npm install
+    exit
+  EOF
 
   #Symlink systemd service and copy config file:
   #only for systemd-systems