From 315ad582d2f59b3061bf0c8f170aea4e74db2c27 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Thu, 9 Feb 2023 14:43:33 +0000 Subject: [PATCH] Update remove --- scripts/remove | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/scripts/remove b/scripts/remove index cdf4fee..6a1ae2e 100644 --- a/scripts/remove +++ b/scripts/remove @@ -67,12 +67,25 @@ ynh_remove_nodejs #================================================= # REMOVE SANDBOX DOMAIN #================================================= -ynh_script_progression --message="Removing sandbox domain..." --weight=1 # We don't test that in CI if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - 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="Removing sandbox domain : $sandboxdomain" --weight=1 + if yunohost domain list | grep -q $sandboxdomain then #if domain exist we remove it yunohost domain remove $sandboxdomain