From b1b0ea429996844d4a30badad2cd5d8f167ecaa1 Mon Sep 17 00:00:00 2001
From: magikcypress <cyp@rouquin.me>
Date: Mon, 29 Aug 2016 16:55:20 +0200
Subject: [PATCH] Update package + install

---
 README.md       |  5 +++++
 manifest.json   |  8 ++++++--
 scripts/install |  4 ++--
 scripts/upgrade | 25 -------------------------
 4 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 4728c86..02ede76 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,11 @@
 
 ## Spip for YunoHost
 
+Version 1.0.2 (29/08/16)
+
+- Fix Packaging [Source](https://forum.yunohost.org/t/news-about-app-management-and-packaging-in-yunohost-2-4/1379/1)
+- Update SPIP Version
+
 Version 1.0.1 (04/01/16)
 
 - Delete SPIP sources
diff --git a/manifest.json b/manifest.json
index bc14a50..a0ab0df 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,15 +1,19 @@
 {
     "name": "SPIP",
+    "packaging_format": 1,
     "id": "spip",
     "description": {
         "en": "SPIP - publishing system for the Internet",
         "fr": "SPIP - Système de publication pour l’Internet"
     },
     "license": "GPL-3",
-    "developer": {
+    "maintainer": {
         "name": "cyp",
         "email": "cyp@rouquin.me",
-        "url": "http://rouquin.me"
+        "url": "http://www.rouquin.me"
+    },
+    "requirements": {
+        "yunohost": ">> 2.4.0"
     },
     "url": "http://www.spip.net/",
     "multi_instance": "true",
diff --git a/scripts/install b/scripts/install
index 33f3fdb..782b173 100644
--- a/scripts/install
+++ b/scripts/install
@@ -31,8 +31,8 @@ sudo yunohost app setting spip mysqlpwd -v $db_pwd
 
 # Download and extract files to the right place
 final_path=/var/www
-wget http://files.spip.org/spip/stable/spip-3.0.zip
-unzip spip-3.0.zip -d $final_path
+wget http://files.spip.org/spip/stable/spip-3.1.zip
+unzip spip-3.1.zip -d $final_path
 
 # Set permissions to spip directory
 sudo chown -R www-data: $final_path
diff --git a/scripts/upgrade b/scripts/upgrade
index d6d6cc8..5431de8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,31 +13,6 @@ final_path=/var/www/spip
 
 db_name=spip
 
-# if [[ "$admin_spip" = "" ]];
-# then
-#     mysql -u root -p$root_pwd $db_name -e "select MAX(user_login) from wp_users where user_status=0 INTO OUTFILE '/tmp/spipuser';"
-#     admin_spip=$(cat /tmp/spipuser)
-#     sudo rm -f /tmp/spipuser
-# fi
-
-# if [[ "$language" = "" ]];
-# then
-#     language=$(sudo grep WPLANG $final_path/wp-config.php | cut -d"'" -f4)
-# fi
-
-# if [[ "$is_public" = "" ]];
-# then
-#     mysql -u root -p$root_pwd $db_name -e "select option_value from wp_options WHERE option_name='active_plugins' INTO OUTFILE '/tmp/spipispublic';"
-#     grep -q http-authentication /tmp/spipispublic
-#     if [[ $? -eq 0 ]];
-#     then
-#         is_public=Yes
-#     else
-#         is_public=No
-#     fi
-#     sudo rm -f /tmp/spipispublic
-# fi
-
 # Check if admin is not null
 if [[ "$admin_spip" = "" || "$is_public" = "" || "$language" = "" ]]; then
     echo "Unable to upgrade, please contact support"