From efac0c73835124680334f08ecc0e646d10fed7e9 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Tue, 3 Apr 2018 13:04:11 +0530
Subject: [PATCH 1/4] Quick fix: typo in ynh_find_port

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index e608e1a..8d57fdb 100644
--- a/scripts/install
+++ b/scripts/install
@@ -69,7 +69,7 @@ ynh_app_setting_set "$app" is_public "$is_public"
 #=================================================
 
 # Find a free port
-port=(ynh_find_port "9000")
+port=$(ynh_find_port "9000")
 # Open this port
 yunohost firewall allow Both "$port" 2>&1
 ynh_app_setting_set "$app" port "$port"

From 7a6f60f8eaad6721b08c83a627b68b8ac5f48701 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Wed, 4 Apr 2018 11:27:35 +0530
Subject: [PATCH 2/4] Nodejs should be installed before yarn(install)

---
 scripts/install | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/install b/scripts/install
index 8d57fdb..a08cdc3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -87,6 +87,9 @@ mkdir -p "$datadir"
 # INSTALL DEPENDENCIES
 #=================================================
 
+# install nodejs
+ynh_install_nodejs 8
+
 # install yarn
 wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
 echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
@@ -99,9 +102,6 @@ ynh_package_update
 # install postgresql, ffmpeg, redis
 ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools
 
-# install nodejs
-ynh_install_nodejs 8
-
 #=================================================
 # DATABASE SETUP
 #=================================================

From 42cff4ea618ef2fd9623bb61d642b122d871dd59 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Wed, 4 Apr 2018 11:29:01 +0530
Subject: [PATCH 3/4] Nodejs should be installed before yarn(upgrade)

---
 scripts/upgrade | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a6ec8e6..1ede0e7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -79,6 +79,9 @@ ynh_system_user_create "$app"
 # INSTALL DEPENDENCIES
 #=================================================
 
+# install nodejs
+ynh_install_nodejs 8
+
 # install yarn
 wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
 echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
@@ -91,9 +94,6 @@ ynh_package_update
 # install postgresql, ffmpeg, redis
 ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools
 
-# install nodejs
-ynh_install_nodejs 8
-
 #=================================================
 # CHECK THE PATH
 #=================================================

From b0b9525eebdffbad4b6bdec102200e8327b55140 Mon Sep 17 00:00:00 2001
From: anmol26s <5068843+anmol26s@users.noreply.github.com>
Date: Wed, 4 Apr 2018 11:30:27 +0530
Subject: [PATCH 4/4] nodejs should be installed before yarn(restore)

---
 scripts/restore | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 6ef80e6..5e8effa 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -91,6 +91,10 @@ chown -R "$app" "$datadir"
 #=================================================
 
 # install yarn
+
+# install nodejs
+ynh_install_nodejs 8
+
 wget https://github.com/yarnpkg/yarn/releases/download/v1.5.1/yarn_1.5.1_all.deb
 echo "a4770cd8dcb13dc9a9218940dbd24b510ddf5eec78adb4e0da9ef3760b55a76e yarn_1.5.1_all.deb" | sha256sum -c || ynh_die
 dpkg -i yarn_1.5.1_all.deb
@@ -102,9 +106,6 @@ ynh_package_update
 # Define and install dependencies
 ynh_install_app_dependencies postgresql-9.4 ffmpeg redis-server redis-tools
 
-# install nodejs
-ynh_install_nodejs 8
-
 #=================================================
 # RESTORE THE PostgreSQL DATABASE
 #=================================================