From 6b53e6a3af558b9accce2e0ca607a1aa39e23d0b Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Thu, 17 Nov 2016 00:52:27 +0100
Subject: [PATCH 1/2] Fix temporaire du restore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Correction temporaire pour éviter une erreur du script restore, voir https://dev.yunohost.org/issues/593
---
 scripts/restore | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index e97c612..39b0b05 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -18,8 +18,9 @@ path=$(ynh_app_setting_get "$app" path)
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 
 # TODO: Check domain/path availability with app helper
-sudo yunohost app checkurl "${domain}${path}" -a "$app" \
-  || ynh_die "The path ${domain}${path} is not available for app installation."
+# Temporarily commented, see https://dev.yunohost.org/issues/593
+#sudo yunohost app checkurl "${domain}${path}" -a "$app" \
+#  || ynh_die "The path ${domain}${path} is not available for app installation."
 
 # Check destination directory
 DESTDIR="/var/www/$app"

From 2ce529b78c467fd3dfbff0abde1b77721dc77fd2 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackcrudelis@users.noreply.github.com>
Date: Thu, 17 Nov 2016 20:14:11 +0100
Subject: [PATCH 2/2] Ignore checkurl seulement pour la racine

---
 scripts/restore | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/restore b/scripts/restore
index 39b0b05..a88e502 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -18,9 +18,11 @@ path=$(ynh_app_setting_get "$app" path)
 dbpass=$(ynh_app_setting_get "$app" mysqlpwd)
 
 # TODO: Check domain/path availability with app helper
-# Temporarily commented, see https://dev.yunohost.org/issues/593
-#sudo yunohost app checkurl "${domain}${path}" -a "$app" \
-#  || ynh_die "The path ${domain}${path} is not available for app installation."
+# Temporarily conditioned, see https://dev.yunohost.org/issues/593
+if [ ${#path} -gt 1 ]; then
+  sudo yunohost app checkurl "${domain}${path}" -a "$app" \
+    || ynh_die "The path ${domain}${path} is not available for app installation."
+fi
 
 # Check destination directory
 DESTDIR="/var/www/$app"