Remove 2.2 compatibility

manifest2.2.json

@@ -1,78 +0,0 @@
-{
-    "name": "WordPress",
-    "id": "wordpress",
-    "packaging_format": 1,
-    "description": {
-        "en": "Create a beautiful blog or website easily",
-        "fr": "Logiciel de création de blog ou de site Web"
-    },
-	"version": "4.5.2",
-	"url": "https://wordpress.org/",
-    "licence": "free",
-    "maintainer": {
-        "name": "Maniack Crudelis et beudbeud",
-        "email": "maniackc_dev@crudelis.fr, beudbeud@beudibox.fr"
-    },
-    "multi_instance": "true",
-    "services": [
-        "nginx",
-        "php5-fpm",
-        "mysql"
-    ],
-    "arguments": {
-        "install" : [
-            {
-                "name": "domain",
-                "ask": {
-                    "en": "Choose a domain for WordPress",
-                    "fr": "Choisissez un domaine pour WordPress"
-                },
-                "example": "domain.org"
-            },
-            {
-                "name": "path",
-                "ask": {
-                    "en": "Choose a path for WordPress",
-                    "fr": "Choisissez un chemin pour WordPress"
-                },
-                "example": "/blog",
-                "default": "/blog"
-            },
-            {
-                "name": "admin",
-                "ask": {
-                    "en": "Choose the WordPress administrator (must be an existing YunoHost user)",
-                    "fr": "Administrateur du site (doit être un utilisateur YunoHost existant)"
-                },
-                "example": "john"
-            },
-            {
-                "name": "language",
-                "ask": {
-                    "en": "Choose the language of the WordPress site",
-                    "fr": "Choissisez la langue du WordPress"
-                },
-                "choices": ["en_EN", "fr_FR"],
-                "default": "en_EN"
-            },
-            {
-                "name": "multisite",
-                "ask": {
-                    "en": "Enable multisite option ?",
-                    "fr": "Activer l'option multisite ?"
-                },
-                "choices": ["Yes", "No"],
-                "default": "No"
-            },
-            {
-                "name": "is_public",
-                "ask": {
-                    "en": "Is it a public WordPress site ?",
-                    "fr": "Est-ce un site public ?"
-                },
-                "choices": ["Yes", "No"],
-                "default": "Yes"
-            }
-        ]
-    }
-}

scripts/install

@@ -1,29 +1,16 @@
 #!/bin/bash
 
-ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2)
-# Retrieve arguments
-if [ $ynh_version = "2.4" ]
-then
-	domain=$YNH_APP_ARG_DOMAIN
-	path=$YNH_APP_ARG_PATH
-	admin_wordpress=$YNH_APP_ARG_ADMIN
-	language=$YNH_APP_ARG_LANGUAGE
-	multisite=$YNH_APP_ARG_MULTISITE
-	is_public=$YNH_APP_ARG_IS_PUBLIC
+domain=$YNH_APP_ARG_DOMAIN
+path=$YNH_APP_ARG_PATH
+admin_wordpress=$YNH_APP_ARG_ADMIN
+language=$YNH_APP_ARG_LANGUAGE
+multisite=$YNH_APP_ARG_MULTISITE
+is_public=$YNH_APP_ARG_IS_PUBLIC
 
-	app=$YNH_APP_INSTANCE_NAME
+app=$YNH_APP_INSTANCE_NAME
 
-	# Source app helpers
-	. /usr/share/yunohost/helpers
-else
-	domain=$1
-	path=$2
-	admin_wordpress=$3
-	language=$4
-	multisite=$5
-	is_public=$6
-	app=wordpress
-fi
+# Source app helpers
+. /usr/share/yunohost/helpers
 
 
 # Delete files and db if exit with an error
@@ -35,9 +22,6 @@ EXIT_PROPERLY () {
 	# Clean hosts
 	sudo sed -i '/#wordpress_yunohost/d' /etc/hosts
 
-	if [ $ynh_version = "2.2" ]; then
-		/bin/bash ./remove	# Appel le script remove. En 2.2, ce comportement n'est pas automatique.
-	fi
 	exit 1
 }
 TRAP_ON () {	# Activate signal capture
@@ -97,11 +81,7 @@ db_pwd=$(head -n20 /dev/urandom | tr -c -d 'A-Za-z0-9' | head -c20)
 # Utilise '$app' comme nom d'utilisateur et de base de donnée
 db_user=$app
 # Initialise la base de donnée et stocke le mot de passe mysql.
-if [ $ynh_version = "2.4" ]; then
-	ynh_mysql_create_db $db_user $db_user $db_pwd
-else
-	sudo yunohost app initdb $db_user -p $db_pwd
-fi
+ynh_mysql_create_db $db_user $db_user $db_pwd
 sudo yunohost app setting $app mysqlpwd -v $db_pwd
 
 

scripts/remove

@@ -1,16 +1,10 @@
 #!/bin/bash
 
 # Récupère les infos de l'application.
-ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2)
-if [ $ynh_version = "2.4" ]; then
-	app=$YNH_APP_INSTANCE_NAME
-
-	# Source app helpers
-	. /usr/share/yunohost/helpers
-else
-	app=wordpress
-	MYSQL_ROOT_PWD_FILE="/etc/yunohost/mysql"
-fi
+app=$YNH_APP_INSTANCE_NAME
+
+# Source app helpers
+. /usr/share/yunohost/helpers
 domain=$(sudo yunohost app setting $app domain)
 
 # Suppression de la base de donnée et de l'utilisateur associé.
@@ -18,12 +12,8 @@ domain=$(sudo yunohost app setting $app domain)
 db_user=$app
 if mysqlshow -u root -p$(sudo cat $MYSQL_ROOT_PWD_FILE) | grep -q "^| $db_user"; then
 	echo "Delete db"
-	if [ $ynh_version = "2.4" ]; then
-		ynh_mysql_drop_db $db_user
-		ynh_mysql_drop_user $db_user
-	else
-		mysql -u root -p$(sudo cat $MYSQL_ROOT_PWD_FILE) -e "DROP DATABASE $db_user ; DROP USER $db_user@localhost ;"
-	fi
+	ynh_mysql_drop_db $db_user
+	ynh_mysql_drop_user $db_user
 fi
 
 # Suppression du dossier de l'application

scripts/upgrade

@@ -1,12 +1,7 @@
 #!/bin/bash
 
 # Récupère les infos de l'application.
-ynh_version=$(sudo yunohost -v | grep "moulinette:" | cut -d' ' -f2 | cut -d'.' -f1,2)
-if [ $ynh_version = "2.4" ]; then
-	app=$YNH_APP_INSTANCE_NAME
-else
-	app=wordpress
-fi
+app=$YNH_APP_INSTANCE_NAME
 domain=$(sudo yunohost app setting $app domain)
 path=$(sudo yunohost app setting $app path)
 admin_wordpress=$(sudo yunohost app setting $app admin)