From 1a9d9cee46442558849b4ff71433f658ce367784 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Holcroft <jean-baptiste@holcroft.fr>
Date: Thu, 19 Oct 2017 15:21:24 +0200
Subject: [PATCH] remove '|| true'

---
 scripts/backup  | 4 ++--
 scripts/install | 4 ++--
 scripts/remove  | 8 ++++----
 scripts/restore | 4 ++--
 scripts/upgrade | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 538c223..d369582 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -25,11 +25,11 @@ dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 final_path=$(ynh_app_setting_get "$app" final_path)
 
 # Copy the app source files
-ynh_backup "$final_path" > ./db.sql
+ynh_backup "$final_path"
 
 # Copy the conf files
 ynh_backup "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 ynh_backup "/etc/php5/fpm/pool.d/${app}.conf"
 
 # Dump the database
-ynh_mysql_dump_db "$dbname"
+ynh_mysql_dump_db "$dbname" > ./db.sql
diff --git a/scripts/install b/scripts/install
index deb40d8..84c7655 100644
--- a/scripts/install
+++ b/scripts/install
@@ -102,5 +102,5 @@ fi
 ynh_mysql_connect_as "$dbuser" "$dbpass" "$dbname" < ${final_path}/app/Schema/Sql/mysql.sql
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload
diff --git a/scripts/remove b/scripts/remove
index 2d66042..59500e1 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -12,8 +12,8 @@ dbname=$app
 dbuser=$app
 
 # Drop MySQL database and user
-ynh_mysql_drop_db "$dbname" 2>/dev/null || true
-ynh_mysql_drop_user "$dbuser" 2>/dev/null || true
+ynh_mysql_drop_db "$dbname"
+ynh_mysql_drop_user "$dbuser"
 
 # Retrieve domain from app settings
 domain=$(ynh_app_setting_get "$app" domain)
@@ -24,5 +24,5 @@ ynh_secure_remove "/etc/php5/fpm/pool.d/${app}.conf"
 ynh_secure_remove "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload
diff --git a/scripts/restore b/scripts/restore
index 16eb6b2..533144d 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -43,5 +43,5 @@ ynh_restore_file "/etc/nginx/conf.d/${domain}.d/${app}.conf"
 ynh_restore_file "/etc/php5/fpm/pool.d/${app}.conf"
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload
diff --git a/scripts/upgrade b/scripts/upgrade
index 023ba9c..32c07d9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -101,5 +101,5 @@ then
 fi
 
 # Reload services
-service php5-fpm restart || true
-service nginx reload || true
+service php5-fpm restart
+service nginx reload