From 472a01ec0057d7c654368b629dd67edceeff6be3 Mon Sep 17 00:00:00 2001
From: DDATAA <45762540+Ddataa@users.noreply.github.com>
Date: Fri, 10 Feb 2023 11:13:59 +0000
Subject: [PATCH] Update upgrade

---
 scripts/upgrade | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5aa6ad9..2d0e277 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -105,7 +105,21 @@ chgrp -R www-data $final_path
 #=================================================
 # CREATE A SANDBOX DOMAIN
 #=================================================
-sandboxdomain=sandbox-$domain
+# if the main domain for the app is a root domain, we create a correct sandbox subdomain
+if [[ $domain == *"."* ]]; then
+	sandboxdomain=sandbox.$domain
+fi
+# if the main domain for the app is already a sub-domain, we create a correct sandbox domain
+if [[ $domain == *"."*"."* ]]; then
+	sandboxdomain=sandbox-$domain
+fi
+# if the main domain for the app is a .local root domain, we create a correct sandbox subdomain
+if [[ $domain == *".local" ]]; then
+	sandboxdomain=sandbox-$domain
+fi
+
+ynh_script_progression --message="Setting up sandobx domain : $sandboxdomain" --weight=1
+
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	yunohost domain add $sandboxdomain
@@ -182,12 +196,6 @@ fi
 # We don't test that in CI
 if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then
 	ynh_permission_url --permission="main" --add_url=$sandboxdomain --auth_header=true
-	# there is a bug in core that add a slash at the end of domain in ssowat conf for uris var
-	# so we use ${sandboxdomain%/} to remove the eccessive trailing slash # it doesnt work
-	# we use jq to correct /etc/ssowat/conf.json
-	uri2=$sandboxdomain
-	touch /etc/ssowat/conf.json.persistent
-	cat /etc/ssowat/conf.json | jq --arg uri2 "$uri2" '(.permissions[] | select(.label=="CryptPad") | .uris[1]) |=$uri2' >> /etc/ssowat/conf.json.persistent
 fi
 
 #=================================================