From 6abd376d4d1039c2efb0eb20a9e4b4ecc41b6173 Mon Sep 17 00:00:00 2001
From: rodinux <rodolphe.robles@sfr.fr>
Date: Thu, 8 Sep 2022 11:38:40 +0200
Subject: [PATCH] try repair errors

---
 check_process   |  4 ----
 scripts/upgrade | 16 +++++-----------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/check_process b/check_process
index 89a9335..2b0adb2 100644
--- a/check_process
+++ b/check_process
@@ -16,7 +16,6 @@
 		setup_public=1
 		upgrade=1
 		upgrade=1	from_commit=7205455e0a806a49c48c6d2f005d80d1b74a3355
-		upgrade=1       from_commit=04e1730ff642a2e48dfb533b2136fe90f9eaf133
 		backup_restore=1
 		multi_instance=1
 		change_url=1
@@ -27,6 +26,3 @@ Notification=none
 	; commit=7205455e0a806a49c48c6d2f005d80d1b74a3355
 		name=Previous version
 		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
-	; commit=04e1730ff642a2e48dfb533b2136fe90f9eaf133
-		name=Version 1.0.6~ynh1
-		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&
diff --git a/scripts/upgrade b/scripts/upgrade
index 3b01163..32a97ce 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -97,7 +97,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.0~ynh1
 then
   ynh_script_progression --message="Upgrading to 1.1.0" --weight=5
   # Download, check integrity, uncompress and patch the source from 0.9.8.src
-  ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="1.1.0"
+  ynh_setup_source --keep="config.local.php" --source_id="1.1.0"
   # Set permissions on app files
   ynh_system_user_create --username=$app
   ynh_add_nginx_config
@@ -122,20 +122,14 @@ then
   chown -R $app:$app $final_path
   chmod 755 $final_path
 
-  # Temporarily enable visitors for curl if needed
-  visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no)
-  if [[ $visitors_enabled == "no" ]]; then
-    ynh_permission_update --permission "main" --add "visitors"
-  fi
-
   # Finalize the upgrade
   ynh_local_curl "/index.php"
   sleep 5
   ynh_local_curl "/index.php"
 
-  if [[ $visitors_enabled == "no" ]]; then
-    ynh_permission_update --permission "main" --remove "visitors"
-  fi
+#  if [[ $visitors_enabled == "no" ]]; then
+#    ynh_permission_update --permission "main" --remove "visitors"
+#  fi
 fi
 
 #=================================================
@@ -155,7 +149,7 @@ then
   ynh_script_progression --message="Upgrading source files..." --weight=5
 
   # Download, check integrity, uncompress and patch the source from app.src
-  ynh_setup_source --keep="config.local.user.php" --dest_dir="$final_path"
+  ynh_setup_source --keep="config.local.user.php"
 fi
 
 #=================================================