From a49dde4c707533712ab32378d2902edd41ccfac7 Mon Sep 17 00:00:00 2001
From: Fabian Wilkens <wilkens.fabian+github@gmail.com>
Date: Fri, 9 Jul 2021 12:54:32 +0200
Subject: [PATCH] Fix issues during install and upgrade

---
 check_process               |  2 +-
 scripts/install             |  2 +-
 scripts/upgrade             | 10 ++++++++--
 scripts/ynh_install_ruby__2 |  2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/check_process b/check_process
index f37cdae..a59d504 100644
--- a/check_process
+++ b/check_process
@@ -14,7 +14,7 @@
         setup_sub_dir=1
         setup_root=1
         setup_nourl=0
-        setup_private=1
+        setup_private=0
         setup_public=1
         upgrade=1
         # 3.22.8~yhn2
diff --git a/scripts/install b/scripts/install
index a7e492e..c1c136f 100755
--- a/scripts/install
+++ b/scripts/install
@@ -319,7 +319,7 @@ if [ $is_public -eq 1 ]
 then
     # Everyone can access the app.
     # The "main" permission is automatically created before the install script.
-    ynh_permission_update --permission="main" --add="visitors"
+    ynh_permission_update --permission="main" --add="visitors" --show_tile="false"
 fi
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 1ce35ef..bd2d37f 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -253,7 +253,7 @@ ynh_script_progression --message="Upgrading source files..." --weight=1
 # Remove all files if the old syncing-server is used
 if [[ ! $standalone ]];
 then
-    ynh_secure_remove --file="$final_path/*"
+    ynh_secure_remove --file="$final_path"
     ynh_secure_remove --file="/var/log/$app"
 fi
 
@@ -298,7 +298,7 @@ then
     ynh_secure_remove --file="$config_api_gateway"
     # Download, check integrity, uncompress and patch the source from app.src
     mkdir -p "$final_path/live"
-    ynh_setup_source --source_id=app_api_gateway --dest_dir="$final_path/live/api-gateway"
+    ynh_setup_source --source_id=app_api-gateway --dest_dir="$final_path/live/api-gateway"
 fi
 
 if [[ "$extensions_version_installed" < "$extensions_version" ]]
@@ -311,6 +311,12 @@ then
     then
         cp -a "../sources/extra_files/extensions/." "$final_path_extensions"
     fi
+
+    find "../conf/" -name "ext_*.src" -print0 | while read -d $'\0' file
+    do
+        basename=$(basename -as .src $file)
+        ynh_setup_source  --dest_dir="$final_path_extensions/src/${basename#'ext_'}" --source_id="$basename"
+    done
 fi
 
 chmod 750 "$final_path"
diff --git a/scripts/ynh_install_ruby__2 b/scripts/ynh_install_ruby__2
index 5357cf5..8b07195 100644
--- a/scripts/ynh_install_ruby__2
+++ b/scripts/ynh_install_ruby__2
@@ -297,7 +297,7 @@ ynh_cleanup_ruby () {
     if [[ ! $required_ruby_versions ]]
     then
         # Remove rbenv environment configuration
-        ynh_print_info --message="Removing of rbenv-$rbenv_version"
+        ynh_print_info --message="Removing of rbenv"
         ynh_secure_remove --file="$rbenv_install_dir"
         ynh_secure_remove --file="/etc/profile.d/rbenv.sh"
     fi