From 3c791751c1f0ff052b4581a4a4b81a8fa0b74825 Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Tue, 23 Jul 2019 12:56:25 +0000
Subject: [PATCH 1/6] updated node version

---
 server-ce/.nvmrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-ce/.nvmrc b/server-ce/.nvmrc
index e18a34b9d6..5007551bf8 100644
--- a/server-ce/.nvmrc
+++ b/server-ce/.nvmrc
@@ -1 +1 @@
-6.11.2
+10.16.0

From 3dbced021dffd4761a52b93d011d59dc4c13767b Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Tue, 23 Jul 2019 12:56:49 +0000
Subject: [PATCH 2/6] fixed install-services and split install and compilation

---
 server-ce/bin/compile-services | 23 +++++++++++++++++++++++
 server-ce/bin/install-services | 21 ++++++---------------
 2 files changed, 29 insertions(+), 15 deletions(-)
 create mode 100755 server-ce/bin/compile-services
 mode change 100644 => 100755 server-ce/bin/install-services

diff --git a/server-ce/bin/compile-services b/server-ce/bin/compile-services
new file mode 100755
index 0000000000..3114df405d
--- /dev/null
+++ b/server-ce/bin/compile-services
@@ -0,0 +1,23 @@
+#! env bash
+
+set -ex
+
+grep 'name:' config/services.js | \
+	sed 's/.*name: "\(.*\)",/\1/' | \
+	while read service
+	do
+		pushd $service
+		echo "Compiling Service $service"
+		case $service in 
+			web)
+				make compile_full
+				;;
+			chat)
+				echo "$service doesn't require a compilation"
+				;;	
+			*)
+				npm run compile:all
+				;;
+		esac	
+		popd
+	done
diff --git a/server-ce/bin/install-services b/server-ce/bin/install-services
old mode 100644
new mode 100755
index 3f1e5dd44b..b5a1711102
--- a/server-ce/bin/install-services
+++ b/server-ce/bin/install-services
@@ -1,25 +1,16 @@
 #! env bash
 
-[ -z "`type -t nvm`" ] && cat <<EOF
-
-==========================================================
-== NVM not installed, you should consider installing it ==
-==========================================================
-
-EOF
-
+set -ex
 
 grep 'name:' config/services.js | \
 	sed 's/.*name: "\(.*\)",/\1/' | \
 	while read service
 	do
 		pushd $service
-		echo "Installing Service $service"
-		echo '  installing Node'
-		type -t nvm && nvm install
-		type -t nvm && nvm use
-		echo '  installing Dependencies'
-		npm install
-		grunt install
+		echo "Installing Node from .nvmrc"
+		nvm install && nvm use
+		echo "Installing service $service"
+		npm install --quiet
 		popd
 	done
+

From f06793b5b53e63b696b4cedf85245801f2bd8278 Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Tue, 6 Aug 2019 12:00:43 +0000
Subject: [PATCH 3/6] removed -x option in bash command

---
 server-ce/bin/compile-services | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server-ce/bin/compile-services b/server-ce/bin/compile-services
index 3114df405d..471a2b7130 100755
--- a/server-ce/bin/compile-services
+++ b/server-ce/bin/compile-services
@@ -1,6 +1,6 @@
 #! env bash
 
-set -ex
+set -e
 
 grep 'name:' config/services.js | \
 	sed 's/.*name: "\(.*\)",/\1/' | \

From 1973fbddf13bbef8005376b5cf743cad117a35ff Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Tue, 6 Aug 2019 12:00:55 +0000
Subject: [PATCH 4/6] removed nvm

---
 server-ce/bin/install-services | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/server-ce/bin/install-services b/server-ce/bin/install-services
index b5a1711102..b688a4b4f8 100755
--- a/server-ce/bin/install-services
+++ b/server-ce/bin/install-services
@@ -1,14 +1,12 @@
 #! env bash
 
-set -ex
+set -e
 
 grep 'name:' config/services.js | \
 	sed 's/.*name: "\(.*\)",/\1/' | \
 	while read service
 	do
 		pushd $service
-		echo "Installing Node from .nvmrc"
-		nvm install && nvm use
 		echo "Installing service $service"
 		npm install --quiet
 		popd

From 22477bc187f08641731147fa783dd9a0d44ccd1c Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Thu, 8 Aug 2019 16:11:43 +0000
Subject: [PATCH 5/6] added minification for web

---
 server-ce/bin/compile-services | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server-ce/bin/compile-services b/server-ce/bin/compile-services
index 471a2b7130..31f9873ced 100755
--- a/server-ce/bin/compile-services
+++ b/server-ce/bin/compile-services
@@ -11,6 +11,7 @@ grep 'name:' config/services.js | \
 		case $service in 
 			web)
 				make compile_full
+				make minify
 				;;
 			chat)
 				echo "$service doesn't require a compilation"

From 1c931c347ea5c0b8a3f663096e39d754706bb16f Mon Sep 17 00:00:00 2001
From: mserranom <mserranom@gmail.com>
Date: Mon, 12 Aug 2019 09:32:54 +0000
Subject: [PATCH 6/6] reverted minification for web

---
 server-ce/bin/compile-services | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server-ce/bin/compile-services b/server-ce/bin/compile-services
index 31f9873ced..471a2b7130 100755
--- a/server-ce/bin/compile-services
+++ b/server-ce/bin/compile-services
@@ -11,7 +11,6 @@ grep 'name:' config/services.js | \
 		case $service in 
 			web)
 				make compile_full
-				make minify
 				;;
 			chat)
 				echo "$service doesn't require a compilation"