From c6ec69df8e435110ec924bd322380f0247331920 Mon Sep 17 00:00:00 2001
From: mbugeia <maxime.bugeia@gmail.com>
Date: Tue, 25 Nov 2014 22:08:24 +0100
Subject: [PATCH] [enh] add name choice & cleaner remove

---
 conf/main.xml   |  4 ++--
 scripts/install | 14 ++++++++------
 scripts/remove  |  7 +++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/conf/main.xml b/conf/main.xml
index a956031..5a69827 100644
--- a/conf/main.xml
+++ b/conf/main.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <jappix xmlns="jappix:conf:main">
-    <name>YunoJappix</name>
+    <name>CHANGENAME</name>
     <desc>a free social network</desc>
     <owner_name></owner_name>
     <owner_website></owner_website>
     <legal></legal>
     <language>CHANGELANG</language>
-    <resource>YunoJappix</resource>
+    <resource>CHANGENAME</resource>
     <lock>on</lock>
     <anonymous>off</anonymous>
     <http_auth>on</http_auth>
diff --git a/scripts/install b/scripts/install
index 3ba9cf6..62e37c3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -3,7 +3,8 @@
 # Retrieve arguments
 domain=$1
 path=$2
-language=$3
+name=$3
+language=$4
 
 # Check domain/path availability
 sudo yunohost app checkurl $domain$path -a jappix
@@ -15,10 +16,10 @@ fi
 path=${path%/}
 
 # Copy files to the right place
-  final_path=/var/www/jappix
-  sudo mkdir -p $final_path
-  sudo cp -r ../source/* $final_path
-  sudo cp ../conf/*.xml $final_path/store/conf/
+final_path=/var/www/jappix
+sudo mkdir -p $final_path
+sudo cp -r ../source/* $final_path
+sudo cp ../conf/*.xml $final_path/store/conf/
 
 # Set permissions to jappix directory
 sudo chown -R www-data: $final_path
@@ -27,7 +28,7 @@ sudo chown -R www-data: $final_path
 sudo sed -i "s@PATHTOCHANGE2@$path@g" ../conf/nginx.conf
 
 if [ -z "$path" ]; then
-    path="/"
+  path="/"
 fi
 
 sudo ls $final_path/i18n/$language > /dev/null 2>&1
@@ -45,6 +46,7 @@ sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/main.xml
 sudo sed -i "s@PATHTOCHANGE@$path@g" $final_path/store/conf/hosts.xml
 sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/main.xml
 sudo sed -i "s@CHANGELANG@$language@g" $final_path/store/conf/main.xml
+sudo sed -i "s@CHANGENAME@$name@g" $final_path/store/conf/main.xml
 sudo sed -i "s@DOMAINTOCHANGE@$domain@g" $final_path/store/conf/hosts.xml
 
 # Reload Nginx and regenerate SSOwat conf
diff --git a/scripts/remove b/scripts/remove
index c1ef14a..4fff291 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -3,3 +3,10 @@ domain=$(sudo yunohost app setting jappix domain)
 
 sudo rm -rf /var/www/jappix
 sudo rm -f /etc/nginx/conf.d/$domain.d/jappix.conf
+
+sudo yunohost app setting jappix domain -d
+sudo yunohost app setting jappix path -d
+sudo yunohost app setting jappix language -d
+
+sudo service nginx reload
+sudo yunohost app ssowatconf