From 209a618e52a1d908f17d97b0a1b5d40b1b014d7f Mon Sep 17 00:00:00 2001
From: anmol26s <github@datamol.org>
Date: Wed, 26 Dec 2018 11:00:48 +0530
Subject: [PATCH] Don't sync system folder if it don't exits while update

---
 scripts/install |  8 +++-----
 scripts/upgrade | 23 +++++++++++++++++++----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index 097cd32..1536cd5 100644
--- a/scripts/install
+++ b/scripts/install
@@ -161,11 +161,9 @@ eval \"\$(rbenv init -)\"" > $final_path/.profile
 
 # Install ruby-build
 (
-	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.3 \
-	
-	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3   \
-	
-	exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v \
+	exec_as "$app" $final_path/.rbenv/bin/rbenv install 2.5.3 || true
+	exec_as "$app" $final_path/.rbenv/bin/rbenv global 2.5.3  || true 
+	exec_as "$app" $final_path/.rbenv/versions/2.5.3/bin/ruby -v 
 )
 
 # Create symlink for ruby
diff --git a/scripts/upgrade b/scripts/upgrade
index f837c9c..f1be8c1 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -90,8 +90,20 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.lis
 
 ynh_install_nodejs 8
 
-# add additional package for upgrade
-ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-all
+# TODO: use the same mecanism with other files
+ynh_install_app_dependencies \
+	`# debian packages ` \
+	imagemagick libpq-dev libxml2-dev libxslt1-dev file curl apt-transport-https pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev \
+	`# redis ` \
+	redis-server redis-tools \
+	`# postgresql ` \
+	postgresql postgresql-contrib \
+	`# Ruby ` \
+	autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm3 libgdbm-dev \
+	`# ffmpeg from backports ` \
+	ffmpeg \
+	`# Yarn ` \
+	yarn
 
 #=================================================
 # STANDARD UPGRADE STEPS
@@ -109,7 +121,9 @@ yunohost service stop "$app-streaming"
 # Download Mastodon
 mv "$final_path/live" "$final_path/live_back"
 ynh_setup_source "$final_path/live"  "app-mastodon"
-rsync -a "$final_path/live_back/public/system" "$final_path/live_back/public/."
+if [ -z $final_path/live_back/public/system ]; then
+	rsync -a "$final_path/live_back/public/system" "$final_path/live_back/public/."
+fi
 rsync -a "$final_path/live_back/.env.production" "$final_path/live/."
 rm -Rf "$final_path/live_back"
 
@@ -119,7 +133,6 @@ ynh_secure_remove $final_path/live/config/initializers/timeout.rb
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-
 ynh_replace_string "__PORT_WEB__"    "$port_web"    "../conf/nginx.conf"
 ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/nginx.conf"
 ynh_add_nginx_config
@@ -189,6 +202,8 @@ ynh_add_systemd_config "$app-streaming" "mastodon-streaming.service"
 #=================================================
 
 # Add service YunoHost
+ynh_replace_string "__PORT_WEB__"    "$port_web"    "../conf/mastodon-web.service"
+ynh_replace_string "__PORT_STREAM__" "$port_stream" "../conf/mastodon-streaming.service"
 yunohost service add "$app-web"
 yunohost service add "$app-sidekiq"
 yunohost service add "$app-streaming"