Merge pull request #104 from YunoHost-Apps/testing

Testing

README.md

@@ -5,7 +5,8 @@ It shall NOT be edited by hand.
 
 # VPN Client for YunoHost
 
-[![Integration level](https://dash.yunohost.org/integration/vpnclient.svg)](https://dash.yunohost.org/appci/app/vpnclient) ![](https://ci-apps.yunohost.org/ci/badges/vpnclient.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/vpnclient.maintain.svg)  
+[![Integration level](https://dash.yunohost.org/integration/vpnclient.svg)](https://dash.yunohost.org/appci/app/vpnclient) ![Working status](https://ci-apps.yunohost.org/ci/badges/vpnclient.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/vpnclient.maintain.svg)
+
 [![Install VPN Client with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vpnclient)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -26,11 +27,9 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 **Shipped version:** 2.0.2~ynh9
 
-
-
 ## Screenshots
 
-![](./doc/screenshots/vpnclient.png)
+![Screenshot of VPN Client](./doc/screenshots/vpnclient.png)
 
 ## Disclaimers / important information
 
@@ -38,18 +37,19 @@ Please note that this application is designed to interface with **dedicated, pub
 
 ## Documentation and resources
 
-* YunoHost documentation for this app: https://yunohost.org/app_vpnclient
-* Report a bug: https://github.com/YunoHost-Apps/vpnclient_ynh/issues
+* YunoHost documentation for this app: <https://yunohost.org/app_vpnclient>
+* Report a bug: <https://github.com/YunoHost-Apps/vpnclient_ynh/issues>
 
 ## Developer info
 
 Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing --debug
 or
 sudo yunohost app upgrade vpnclient -u https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing --debug
 ```
 
-**More info regarding app packaging:** https://yunohost.org/packaging_apps
+**More info regarding app packaging:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -1,15 +1,20 @@
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
+
 # VPN Client pour YunoHost
 
-[![Niveau d'intégration](https://dash.yunohost.org/integration/vpnclient.svg)](https://dash.yunohost.org/appci/app/vpnclient) ![](https://ci-apps.yunohost.org/ci/badges/vpnclient.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/vpnclient.maintain.svg)  
+[![Niveau d’intégration](https://dash.yunohost.org/integration/vpnclient.svg)](https://dash.yunohost.org/appci/app/vpnclient) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/vpnclient.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/vpnclient.maintain.svg)
+
 [![Installer VPN Client avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vpnclient)
 
 *[Read this readme in english.](./README.md)*
-*[Lire ce readme en français.](./README_fr.md)*
 
-> *Ce package vous permet d'installer VPN Client rapidement et simplement sur un serveur YunoHost.
-Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+> *Ce package vous permet d’installer VPN Client rapidement et simplement sur un serveur YunoHost.
+Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.*
 
-## Vue d'ensemble
+## Vue d’ensemble
 
 * Installez une connexion VPN sur votre serveur auto-hébergé
 * Utile pour héberger votre serveur derrière un accès internet filtré (et/ou non-neutre)
@@ -22,11 +27,9 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 **Version incluse :** 2.0.2~ynh9
 
+## Captures d’écran
 
-
-## Captures d'écran
-
-![](./doc/screenshots/vpnclient.png)
+![Capture d’écran de VPN Client](./doc/screenshots/vpnclient.png)
 
 ## Avertissements / informations importantes
 
@@ -34,18 +37,19 @@ Notez que cette application est prévue pour fonctionner avec des **VPN dédiés
 
 ## Documentations et ressources
 
-* Documentation YunoHost pour cette app : https://yunohost.org/app_vpnclient
-* Signaler un bug : https://github.com/YunoHost-Apps/vpnclient_ynh/issues
+* Documentation YunoHost pour cette app : <https://yunohost.org/app_vpnclient>
+* Signaler un bug : <https://github.com/YunoHost-Apps/vpnclient_ynh/issues>
 
 ## Informations pour les développeurs
 
 Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing).
 
 Pour essayer la branche testing, procédez comme suit.
-```
+
+``` bash
 sudo yunohost app install https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing --debug
 ou
 sudo yunohost app upgrade vpnclient -u https://github.com/YunoHost-Apps/vpnclient_ynh/tree/testing --debug
 ```
 
-**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

scripts/config

@@ -282,7 +282,7 @@ ynh_app_config_validate() {
             crt_server_ca=$tmp_dir/crt_server_ca
             sed -i '/^\s*<ca>/,/\s*<\/ca>/d' ${config_file}
             sed -i '/^\s*ca\s/d' ${config_file}
-            echo "ca /etc/openvpn/keys/ca-server.crt" >> ${config_file}
+            echo -e "\nca /etc/openvpn/keys/ca-server.crt" >> ${config_file}
         fi
         if grep -q '^\s*<cert>' ${config_file}
         then
@@ -290,7 +290,7 @@ ynh_app_config_validate() {
             crt_client=$tmp_dir/crt_client
             sed -i '/^\s*<cert>/,/\s*<\/cert>/d' ${config_file}
             sed -i '/^\s*cert\s/d' ${config_file}
-            echo "cert /etc/openvpn/keys/user.crt" >> ${config_file}
+            echo -e "\ncert /etc/openvpn/keys/user.crt" >> ${config_file}
         elif ! grep -q '^\s*cert\s' ${config_file}
         then
             crt_client=""
@@ -301,7 +301,7 @@ ynh_app_config_validate() {
             crt_client_key=$tmp_dir/crt_client_key
             sed -i '/^\s*<key>/,/\s*<\/key>/d' ${config_file}
             sed -i '/^\s*key\s/d' ${config_file}
-            echo "key /etc/openvpn/keys/user.key" >> ${config_file}
+            echo -e "\nkey /etc/openvpn/keys/user.key" >> ${config_file}
         elif ! grep -q '^\s*key\s' ${config_file}
         then
             crt_client_key=""
@@ -312,7 +312,7 @@ ynh_app_config_validate() {
             crt_client_ta=$tmp_dir/crt_client_ta
             sed -i '/^\s*<tls-auth>/,/\s*<\/tls-auth>/d' ${config_file}
             sed -i '/^\s*tls-auth\s/d' ${config_file}
-            echo "tls-auth /etc/openvpn/keys/user_ta.key 1" >> ${config_file}
+            echo -e "\ntls-auth /etc/openvpn/keys/user_ta.key 1" >> ${config_file}
         elif ! grep -q '^\s*tls-auth\s' ${config_file}
         then
             crt_client_ta=""