diff --git a/scripts/install b/scripts/install
index 7a807f7f..7ef8d7da 100755
--- a/scripts/install
+++ b/scripts/install
@@ -1,71 +1,82 @@
 #!/bin/bash
 
-#set -eu
+source .fonctions       # Charge les fonctions génériques habituellement utilisées dans le script
+
+CLEAN_SETUP () {
+# Nettoyage des résidus d'installation non pris en charge par le script remove.
+# Pas de nettoyage supplémentaire nécessaire ici...
+        echo ""
+}
+TRAP_ON # Active trap pour arrêter le script si une erreur est détectée.
 
 # Retrieve arguments
-domain=$1
-admin=$2
-email=$3
-upload=$4
+app=$YNH_APP_INSTANCE_NAME
 
-app="hubzilla"
-path="/"
+domain=$YNH_APP_ARG_DOMAIN
+path=$YNH_APP_ARG_PATH
+admin=$YNH_APP_ARG_ADMIN
+email=$YNH_APP_ARG_EMAIL
+upload=$YNH_APP_ARG_UPLOAD
 
 # Source app helpers
 source /usr/share/yunohost/helpers
 
-# Check user parameter
-ynh_user_exists "$admin" \
-  || ynh_die "The chosen admin user does not exist."
-ynh_app_setting_set $app admin_user $admin
+# Vérifie que les variables ne sont pas vides.
+CHECK_VAR "$app" "app name not set"
 
+CHECK_USER "$admin"     # Vérifie la validité de l'user admin
 
-# Check destination directory
-final_path="/var/www/$app"
-[[ -d $final_path ]] && ynh_die \
-"The destination directory '$DESTDIR' already exists.\
- You should safely delete it before installing this app."
+CHECK_PATH      # Vérifie et corrige la syntaxe du path.
+CHECK_DOMAINPATH        # Vérifie la disponibilité du path et du domaine.
 
-sudo yunohost app setting $app is_public -v "Yes"
+# Créer le repertoire de destination et stocke son emplacement.
+CHECK_FINALPATH # Vérifie que le dossier de destination n'est pas déjà utilisé.
+sudo mkdir "$final_path"
+ynh_app_setting_set $app final_path $final_path
 
-# Check domain/path availability
-sudo yunohost app checkurl "${domain}${path}" -a "$app" \
-  || ynh_die "The path ${domain}${path} is not available for app installation."
+# Enregistre les infos dans la config YunoHost
+ynh_app_setting_set $app domain $domain
+ynh_app_setting_set $app path $path
+ynh_app_setting_set $app admin $admin
+ynh_app_setting_set $app admin $email
+ynh_app_setting_set $app admin $upload
 
 # Install dependencies
 sudo apt-get update
 sudo apt-get install -y -qq php5-cli php5-imagick php5-gd php5-mcrypt
 
-# Use 'hubzilla' as database name and user
+# Create db
+#GENERATE_DB $app        # Créer une base de données et un utilisateur dédié au nom de l'app.
+#Password is stored like that in the GENERATE_DB function : ynh_app_setting_set $app mysqlpwd $db_pwd
 db_user=$app
-db_name=$app
-
-# Generate random password
-dbpass=$(ynh_string_random)
-
-# Initialize database and store mysql password for upgrade
-sudo yunohost app initdb $db_user -p $dbpass
-sudo yunohost app setting $app mysqlpwd -v $dbpass
-
-#ynh_app_setting_set "$app" mysqlpwd "$dbpass"
+db_user=${db_user//-/_} # mariadb ne supporte pas les - dans les noms de base de données. Ils sont donc remplacé par des _
+# Génère un mot de passe aléatoire.
+#       db_pwd=$(head -n20 /dev/urandom | tr -c -d 'A-Za-z0-9' | head -c20)
+db_pwd=$(ynh_string_random)
+CHECK_VAR "$db_pwd" "db_pwd empty"
+# Utilise '$app' comme nom d'utilisateur et de base de donnée
+# Initialise la base de donnée et stocke le mot de passe mysql.
+ynh_mysql_create_db "$db_user" "$db_user" $db_pwd
+ynh_app_setting_set $app db_pwd $db_pwd
+ynh_app_setting_set $app db_user $db_user
 
 # Copy source files
-sudo mkdir -p $final_path
+# A revoir
 sudo rsync -va ../sources/ $final_path/
 sudo mkdir -p "$final_path/store/[data]/smarty3"
 sudo chmod -R 777 $final_path/store
 
 # Import database schema
-sudo mysql -u$db_user -p$dbpass $db_name < $final_path/install/schema_mysql.sql
+sudo mysql -u$db_user -p$db_pwd $db_user < $final_path/install/schema_mysql.sql
 
 # Copy the template install/htconfig.sample.php to .htconfig.php
 sudo cp $final_path/install/htconfig.sample.php $final_path/.htconfig.php
 
 # Use sed to add the database information to .htconfig.php
 sudo sed -i "s/your.mysqlhost.com/localhost/g" $final_path/.htconfig.php
-sudo sed -i "s/mysqlpassword/$dbpass/g" $final_path/.htconfig.php
+sudo sed -i "s/mysqlpassword/$db_pwd/g" $final_path/.htconfig.php
 sudo sed -i "s/mysqlusername/$db_user/g" $final_path/.htconfig.php
-sudo sed -i "s/mysqldatabasename/$db_name/g" $final_path/.htconfig.php
+sudo sed -i "s/mysqldatabasename/$db_user/g" $final_path/.htconfig.php
 sudo sed -i "s/mysite.example/$domain/g" $final_path/.htconfig.php
 sudo sed -i "s/if the auto install failed, put a unique random string here/$(ynh_string_random)$(ynh_string_random)$(ynh_string_random)/g" $final_path/.htconfig.php
 sudo sed -i "s/ADMIN_EMAIL_REPLACE/$email/g" $final_path/.htconfig.php
@@ -79,19 +90,19 @@ sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf
 sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf
 
 # Modify php.ini to allow exec() function and increase the upload size limits
+# A revoir completement
 sudo sed -i 's/,pcntl_exec//g' /etc/php5/fpm/php.ini
 sudo sed -i 's/^post_max_size =.*$/post_max_size = $upload/' /etc/php5/fpm/php.ini
 sudo sed -i 's/^upload_max_filesize =.*$/upload_max_filesize = $upload/' /etc/php5/fpm/php.ini
 sudo sed -i 's/^max_file_uploads =.*$/max_file_uploads = 50/' /etc/php5/fpm/php.ini
 
-# Set SSOwat rules
-ynh_app_setting_set "$app" skipped_uris "/"
+# Enable api for client and make app public
+ynh_app_setting_set $app skipped_uris "/"
 
 # Reload services
 sudo service php5-fpm restart || true
 sudo service nginx reload || true
 
-
 # Set up poller
 sed -i "s@YNH_WWW_PATH@$final_path@g" ../conf/poller-cron
 sudo cp ../conf/poller-cron /etc/cron.d/$app