From 0c5853e2b41f47acd040148597f305098af710f6 Mon Sep 17 00:00:00 2001
From: Selamanse <selamanse@scheinfrei.info>
Date: Wed, 10 Jan 2018 17:21:46 +0100
Subject: [PATCH] Adds 0.60.3 upgrade

---
 manifest.json      |  4 ++--
 scripts/_common.sh | 20 +++++++++++++-------
 scripts/upgrade    |  3 +++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/manifest.json b/manifest.json
index 98e3a1d..c3e30fa 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,9 +5,9 @@
     "description": {
         "en": "the ultimate chat platform"
     },
-    "url": "https://github.com/realitygaps/rocketchat_ynh",
+    "url": "https://github.com/YunoHost-Apps/rocketchat_ynh",
     "license": "GPL-3.0",
-    "version": "0.58.4",
+    "version": "0.60.3",
     "maintainer": {
         "name": "selamanse",
         "email": "selamanse@scheinfrei.info",
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 37b03b2..cb75b1d 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,8 +1,8 @@
 # common.sh
 
-ROCKETCHAT_VERSION=0.58.4
-ROCKETCHAT_SHASUM=ed53712b37571b959b5c8c8947d6335c21fced316f2b3174bfe027fa25700c44
-NODE_VERSION=4.8.4
+ROCKETCHAT_VERSION=0.60.4
+ROCKETCHAT_SHASUM=85959cb5173f4ceb7b31c089a8148be530c7af577c9dc6409322ac0324330fb9
+NODE_VERSION=8.9.4
 
 checkcmd() {
   curl -m 1 -s localhost:$port$path/api/v1/info | \
@@ -30,6 +30,14 @@ waitforservice() {
   fi
 }
 
+installnode(){
+
+  sudo apt-get install -y npm
+  # Meteor needs at least this version of node to work.
+  sudo npm install -g n
+  sudo n $NODE_VERSION
+}
+
 installdeps(){
 
   if [ $(dpkg --print-architecture) == "armhf" ]; then
@@ -52,9 +60,7 @@ installdeps(){
   sudo yunohost service add mongod -l /var/log/mongodb/mongod.log
 
   #Install other dependencies
-  sudo apt-get install -y gzip curl graphicsmagick npm
+  sudo apt-get install -y gzip curl graphicsmagick
 
-  # Meteor needs at least this version of node to work.
-  sudo npm install -g n
-  sudo n $NODE_VERSION
+  installnode
 }
diff --git a/scripts/upgrade b/scripts/upgrade
index 5e58aa1..1bee2d4 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,9 @@ sudo systemctl stop rocketchat
 sudo rm -rf $final_path
 sudo mkdir -p $final_path
 
+# update to latest required node setup
+installnode
+
 # download and extract rocketchat
 echo "Downloading rocket.chat-$ROCKETCHAT_VERSION.gtar from https://download.rocket.chat/build/rocket.chat-${ROCKETCHAT_VERSION}.tgz."
 sudo curl -s -L -o $final_path/rocket.chat-$ROCKETCHAT_VERSION.gtar "https://download.rocket.chat/build/rocket.chat-${ROCKETCHAT_VERSION}.tgz"