Merge pull request #18 from YunoHost-Apps/testing

Testing

README.md

@@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man
 - Flexible
 
 
-**Shipped version:** 12.3.05~ynh2
+**Shipped version:** 12.3.06~ynh1
 
 ## Screenshots
 

README_fr.md

@@ -29,7 +29,7 @@ Zwii is a database-less (flat-file) CMS that allows you to easily create and man
 - Flexible
 
 
-**Version incluse :** 12.3.05~ynh2
+**Version incluse :** 12.3.06~ynh1
 
 ## Captures d’écran
 

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.3.05.tar.gz
+SOURCE_URL=https://forge.chapril.org/ZwiiCMS-Team/ZwiiCMS/archive/12.3.06.tar.gz
-SOURCE_SUM=e7494600a62de57101a17fddc199f6670fe051bfd33d0a8d7b9e01ac2ef10358
+SOURCE_SUM=0b54920ff977c70c80f359327534b2636a562649f42a5a1839e7d04317277db6
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

doc/POST_UPGRADE.md

@@ -1,19 +0,0 @@
-## You need now to finalize the upgrade process of ZwiiCMS directly in the app.
-
-#### 1. Login with your admin account
-
-#### 2. Go to setup page
-
-![Setup menu](./upgrade_process_1.png)
-
-#### 3. Click on Reinstall
-
-![Reinstall](./upgrade_process_2.png)
-
-#### 4. If needed, deactivate the maintenance mode
-
-![Maintenance mode](./upgrade_process_3.png)
-
-#### 5. Save
-
-![Save](./upgrade_process_4.png)

doc/PRE_UPGRADE.md

@@ -1,6 +0,0 @@
-## Disclaimers / important information
-By continuing the app will stay in **maintenance mode** until a manual finalization.
-
-The manual finalization process is easy. You just need to be able to access the webapp and login with your admin account.
-
-This process will be explain at the end of the upgarde proccess.

manifest.toml

@@ -5,7 +5,7 @@ name = "ZwiiCMS"
 description.en = "Simple, lightweight, database-free, scalable and responsive CMS"
 description.fr = "CMS simple, léger, sans base de données, modulable et responsive"
 
-version = "12.3.05~ynh2"
+version = "12.3.06~ynh1"
 
 maintainers = ["ewilly"]
 

scripts/upgrade

@@ -34,8 +34,8 @@ find "$install_dir" -type d -exec chmod +s {} \;
 # UPDATE A CONFIG FILE
 #=================================================
 
-# Apply maintenance mode
+# Remove updateAvailable flag
-sed -i 's/"maintenance":[^,]*/"maintenance":true/g' "$install_dir/site/data/config.json"
+sed -i 's/"updateAvailable":[^,}]*/"updateAvailable":false/g' "$install_dir/site/data/core.json"
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS