From 9b36c3d5ebe426176339eba3f44e2cc06a234a51 Mon Sep 17 00:00:00 2001
From: polytan02 <polytan02@mcgva.org>
Date: Sun, 12 Apr 2015 23:30:00 +0100
Subject: [PATCH] Removal of trainiling / for path

---
 scripts/install | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/install b/scripts/install
index d52982d..b67dafd 100644
--- a/scripts/install
+++ b/scripts/install
@@ -6,19 +6,22 @@ domain=$1
 path=$2
 is_public=$3
 
-# Removal of trailing /
-path=${path%/}
-
-# sitename == path without "/"
-sitename=$(echo $path | cut -d '/' -f 2)
-
 if [ $path = "/" ]
 then
 	sitename="root"
+	sudo yunohost app setting $app path -v $path
+else
+	# sitename == path without any "/"
+	sitename=$(echo $path | cut -d '/' -f 2)
 fi
 
 final_path=/var/www/webapp\_multi/$domain/$sitename
 
+sudo yunohost app setting $app path -v $path
+
+# Removal of trailing /
+# path can be null but not really an issue for the following commands
+path=${path%/}
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a $app
@@ -28,7 +31,6 @@ fi
 
 sudo yunohost app setting $app final_path -v $final_path
 sudo yunohost app setting $app domain -v $domain
-sudo yunohost app setting $app path -v $path
 sudo yunohost app setting $app sitename -v $sitename
 
 # Creation of folder
@@ -56,8 +58,6 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$sitename.conf
 if [ $is_public = "Yes" ];
 then
 	sudo yunohost app setting $app unprotected_uris -v "/"
-#else
-#	sudo yunohost app setting $app protected_uris -v "/"
 fi
 
 # Reload Nginx and regenerate SSOwat conf