fix

README.md

@@ -3,21 +3,50 @@
 [![Integration level](https://dash.yunohost.org/integration/movim.svg)](https://dash.yunohost.org/appci/app/movim) ![](https://ci-apps.yunohost.org/ci/badges/movim.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/movim.maintain.svg)  
 [![Install Movim with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=movim)
 
-Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol : https://movim.eu .
+*[Lire ce readme en français.](./README_fr.md)*
 
-It is recommended to use a "valid" certificate to use Movim, auto-signed is sometimes problematic. You might want to take a look a StartSSL or Let's Encrypt.
+> *This package allows you to install Movim quickly and simply on a YunoHost server.  
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
 
-Provided Movim version: 0.18
+## Overview
+Movim is a decentralized social network, written in PHP and HTML5 and based on the XMPP standard protocol: https://movim.eu
 
-Please read CHANGELOG.
+**Shipped version:** 0.18
 
-**Installation**
+## Screenshots
 
-    yunohost app install https://github.com/movim/movim_ynh
+![](https://camo.githubusercontent.com/1392d5eb8cd2824d7eb121424392e82f9393a5ad/68747470733a2f2f6d6f76696d2e65752f696d672f686f6d652e706e67)
 
-**Upgrade**
+## Demo
 
-    yunohost app upgrade movim -u https://github.com/movim/movim_ynh
+* [Official demo](https://nl.movim.eu/?login)
+
+## Configuration
+
+How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+
+## Documentation
+
+ * Official documentation: Link to the official documentation of this app
+ * YunoHost documentation: If specific documentation is needed, feel free to contribute.
+
+## YunoHost specific features
+
+#### Multi-user support
+
+* Are LDAP and HTTP auth supported?
+* Can the app be used by multiple users?
+
+#### Supported architectures
+
+* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/movim%20%28Apps%29.svg)](https://ci-apps.yunohost.org/ci/apps/movim/)
+* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/movim%20%28Apps%29.svg)](https://ci-apps-arm.yunohost.org/ci/apps/movim/)
+
+## Limitations
+
+* Any known limitations.
+
+## Additional information
 
 **Options**
 
@@ -35,10 +64,22 @@ Please read CHANGELOG.
 
 Username and password are defined during installation.
 
-**Remove**
+## Links
 
-    yunohost app remove movim
+ * Report a bug: https://github.com/YunoHost-Apps/movim_ynh/issues
+ * App website: https://movim.eu/
+ * Upstream app repository: https://github.com/movim/movim
+ * YunoHost website: https://yunohost.org/
 
-**Help**
+---
 
-Just open an issue.
+## Developer info
+
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/movim_ynh/tree/testing).
+
+To try the testing branch, please proceed like that.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/movim_ynh/tree/testing --debug
+or
+sudo yunohost app upgrade movim -u https://github.com/YunoHost-Apps/movim_ynh/tree/testing --debug
+```

scripts/install

@@ -139,14 +139,17 @@ ynh_store_file_checksum --file="$final_path/config/db.inc.php"
 # Install PHP dependencies using composer
 #=================================================
 
-(
+# (
-	cd "$final_path"
+# 	cd "$final_path"
-	export COMPOSER_HOME=$final_path
+# 	export COMPOSER_HOME=$final_path
-	curl -sS https://getcomposer.org/installer | php -- --install-dir="$final_path" \
+# 	curl -sS https://getcomposer.org/installer | php -- --install-dir="$final_path" \
-		&& php composer.phar config --global discard-changes true --quiet \
+# 		&& php composer.phar config --global discard-changes true --quiet \
-		&& php composer.phar install --no-interaction --quiet
+# 		&& php composer.phar install --no-interaction --quiet
-)
+# )
 
+pushd "$final_path" || ynh_die
+	composer install
+popd || ynh_die
 #=================================================
 # SETUP SYSTEMD
 #=================================================
@@ -160,14 +163,16 @@ ynh_add_systemd_config
 #=================================================
 # Set-up database and configuration
 #=================================================
+cd "$final_path"
+php composer.phar movim:migrate
 
-(
+# (
-	cd "$final_path"
+# 	cd "$final_path"
-	php mud.php db --set
+# 	php mud.php db --set
-	php mud.php config --loglevel=1 \
+# 	php mud.php config --loglevel=1 \
-	    --locale="$language" --timezone="$timezone" \
+# 	    --locale="$language" --timezone="$timezone" \
-	    --username="$admin" --password="$password"
+# 	    --username="$admin" --password="$password"
-)
+# )
 
 #=================================================
 # GENERIC FINALIZATION
@@ -176,10 +181,12 @@ ynh_add_systemd_config
 #=================================================
 
 # TODO: use more strict permissions
-chown -R "$app":www-data "$final_path"
+# chown -R "$app":www-data "$final_path"
-find "${final_path}/" -type f -print0 | xargs -0 chmod 0644
+# find "${final_path}/" -type f -print0 | xargs -0 chmod 0644
-find "${final_path}/" -type d -print0 | xargs -0 chmod 0755
+# find "${final_path}/" -type d -print0 | xargs -0 chmod 0755
-chmod 400 "${final_path}/config/db.inc.php"
+# chmod 400 "${final_path}/config/db.inc.php"
+
+chown www-data $final_path && chown www-data $final_path/public && chmod u+rwx $final_path
 
 #=================================================
 # SETUP SSOWAT