From 4eb853d95d306bcdc2f51dabc7581ee92bf6d88d Mon Sep 17 00:00:00 2001
From: Limezy <arnaudetpia@de-ruffray.fr>
Date: Tue, 30 Nov 2021 00:47:50 +0700
Subject: [PATCH] Second test

---
 scripts/backup     | 12 ++++++++----
 scripts/change_url | 10 +++++++---
 scripts/install    | 14 +++++++-------
 scripts/remove     | 11 +++++++----
 scripts/restore    | 28 ++++++++++++++++------------
 scripts/upgrade    | 10 +++++++---
 6 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index ae7ba5f..5fafe14 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -38,10 +38,14 @@ slack_key=$(ynh_app_setting_get --app=$app --key=slack_key)
 slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
+
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+
+	if [ $minio_domain != "sub.domain.tld" ]; then
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+	fi
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
@@ -57,7 +61,7 @@ ynh_print_info --message="Declaring files to be backed up..."
 # BACKUP MINIO
 #=================================================
 
-if $minio_domain != "sub.domain.tld"; then
+if [ $minio_domain != "sub.domain.tld" ]; then
 	pushd "$mc_path"
 	        ynh_exec_warn_less sudo -u minio mkdir outlinestorage
 	        ynh_exec_warn_less sudo -u minio ./mc mirror --a minio/outlinestorage ./outlinestorage/
diff --git a/scripts/change_url b/scripts/change_url
index 8abf6bb..2a9d366 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -37,10 +37,14 @@ slack_key=$(ynh_app_setting_get --app=$app --key=slack_key)
 slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
+
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+
+	if [ $minio_domain != "sub.domain.tld" ]; then
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+	fi
 
 #=================================================
 # BACKUP BEFORE CHANGE URL THEN ACTIVE TRAP
diff --git a/scripts/install b/scripts/install
index ce0176f..2b605af 100755
--- a/scripts/install
+++ b/scripts/install
@@ -57,16 +57,16 @@ if ! yunohost app list | grep -q "id: minio"; then
 	if yunohost app list | grep -q "$YNH_APP_ARG_MINIO_DOMAIN"; then
 		ynh_die "The domain provided for MinIO is already used by another app. Please chose another one !"
 	fi
-	if $YNH_APP_ARG_MINIO_DOMAIN != "sub.domain.tld"; then
+	if [ $YNH_APP_ARG_MINIO_DOMAIN != "sub.domain.tld" ]; then
 		yunohost app install https://github.com/limezy/minio_ynh --force --args "domain=$YNH_APP_ARG_MINIO_DOMAIN&is_public=true&language=en"
+		minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path); else
+		minio_domain="sub.domain.tld"
 	fi
 fi
 
-minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
-
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
@@ -156,7 +156,7 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Setting up MinIO bucket for Outline..." --weight=1
 
-if $YNH_APP_ARG_MINIO_DOMAIN != "sub.domain.tld"; then
+if [ $YNH_APP_ARG_MINIO_DOMAIN != "sub.domain.tld" ]; then
 	pushd "$mc_path"
 		ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1"
 		ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage
diff --git a/scripts/remove b/scripts/remove
index 21aba7b..377b937 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -28,9 +28,12 @@ utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
 
 
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+
+	if [ $minio_domain != "sub.domain.tld" ]; then
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+	fi
 
 #=================================================
 # STANDARD REMOVE
@@ -91,7 +94,7 @@ ynh_secure_remove --file="$final_path"
 #=================================================
 ynh_script_progression --message="Removing Outline MinIO bucket..." --time --weight=1
 
-if $minio_domain != "sub.domain.tld"; then
+if [ $minio_domain != "sub.domain.tld" ]; then
 	pushd "$mc_path"
 		ynh_exec_warn_less sudo -u minio ./mc rb minio/outlinestorage --force
 	popd
diff --git a/scripts/restore b/scripts/restore
index 0f8b046..44ad231 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -47,10 +47,14 @@ slack_key=$(ynh_app_setting_get --app=$app --key=slack_key)
 slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
+
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+
+	if [ $minio_domain != "sub.domain.tld" ]; then
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+	fi
 
 #=================================================
 # CHECK IF THE APP CAN BE RESTORED
@@ -92,15 +96,15 @@ chown -R $app:www-data "$final_path"
 # RESTORE MINIO
 #=================================================
 
-if $minio_domain != "sub.domain.tld"; then
-mv "$final_path/outlinestorage" "$mc_path/outlinestorage"
-chown -R minio:www-data "$mc_path/outlinestorage"
-	pushd "$mc_path"
-		ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1"
-		ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage
-		ynh_exec_warn_less sudo -u minio ./mc mirror --a ./outlinestorage/ minio/outlinestorage
-	popd
-ynh_secure_remove --file="$mc_path/outlinestorage"
+if [ $minio_domain != "sub.domain.tld" ]; then
+	mv "$final_path/outlinestorage" "$mc_path/outlinestorage"
+	chown -R minio:www-data "$mc_path/outlinestorage"
+		pushd "$mc_path"
+			ynh_exec_warn_less sudo -u minio ./mc mb minio/outlinestorage --region "fr-ynh-1"
+			ynh_exec_warn_less sudo -u minio ./mc policy set public minio/outlinestorage
+			ynh_exec_warn_less sudo -u minio ./mc mirror --a ./outlinestorage/ minio/outlinestorage
+		popd
+	ynh_secure_remove --file="$mc_path/outlinestorage"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 8199ce3..569a4b9 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -26,10 +26,14 @@ slack_key=$(ynh_app_setting_get --app=$app --key=slack_key)
 slack_secret=$(ynh_app_setting_get --app=$app --key=slack_secret)
 secret_key=$(ynh_app_setting_get --app=$app --key=secret_key)
 utils_secret=$(ynh_app_setting_get --app=$app --key=utils_secret)
+
 minio_domain=$(ynh_app_setting_get --app="minio" --key=domain)
-minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
-minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
-mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+
+	if [ $minio_domain != "sub.domain.tld" ]; then
+		minio_id=$(ynh_app_setting_get --app="minio" --key=minio_id)
+		minio_key=$(ynh_app_setting_get --app="minio" --key=minio_key)
+		mc_path=$(ynh_app_setting_get --app="minio" --key=mc_path)
+	fi
 
 #=================================================
 # CHECK VERSION