Testing (#39)

* 2.0.19

README.md

@@ -1,62 +1,47 @@
+<!--
+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.
+-->
+
 # Webtrees for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg)  
 [![Install Webtrees with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees)
 
-> *This package allow you to install Webtrees quickly and simply on a YunoHost server.  
+*[Lire ce readme en français.](./README_fr.md)*
-If you don't have YunoHost, please see [here](https://yunohost.org/install) to know how to install and enjoy it.*
+
+> *This package allows you to install Webtrees 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.*
 
 ## Overview
+
 Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set.
 
--It works from standard GEDCOM files, and is therefore compatible with every major desktop application.
+- It works from standard GEDCOM files, and is therefore compatible with every major desktop application.
--It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards.
+- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards.
 
 **Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
 
-**Shipped version:** 2.0.16
+
+**Shipped version:** 2.0.19~ynh1
+
+**Demo:** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
 
 ## Screenshots
 
-![](https://upload.wikimedia.org/wikipedia/commons/thumb/0/01/Webtrees.png/1200px-Webtrees.png)
+![](./doc/screenshots/1200px-Webtrees.png)
 
-## Demo
+## Documentation and resources
 
-* [Official demo](https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo)
+* Official app website: https://www.webtrees.net
-
+* Official admin documentation: https://wiki.webtrees.net
-## Configuration
+* Upstream app code repository: https://github.com/fisharebest/webtrees
-
+* YunoHost documentation for this app: https://yunohost.org/app_webtrees
-How to configure this app: From an admin panel, a plain file with SSH, or any other way.
+* Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues
-
-## Documentation
-
- * Official documentation: https://wiki.webtrees.net
- * YunoHost documentation: If specific documentation is needed, feel free to contribute.
-
-## YunoHost specific features
-
-#### Multi-user support
-
- * Are LDAP and HTTP auth supported? **No**
- * Can the app be used by multiple users? **Yes**
-
-#### Supported architectures
-
-* x86-64 - [![Build Status](https://ci-apps.yunohost.org/ci/logs/webtrees.svg)](https://ci-apps.yunohost.org/ci/apps/webtrees/)
-* ARMv8-A - [![Build Status](https://ci-apps-arm.yunohost.org/ci/logs/webtrees.svg)](https://ci-apps-arm.yunohost.org/ci/apps/webtrees/)
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/webtrees_ynh/issues
- * App website: https://www.webtrees.net
- * Upstream app repository: https://github.com/fisharebest/webtrees
- * YunoHost website: https://yunohost.org/
-
----
 
 ## Developer info
 
-Please do your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing).
+Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing).
 
 To try the testing branch, please proceed like that.
 ```
@@ -64,3 +49,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/tes
 or
 sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps

README_fr.md

@@ -0,0 +1,49 @@
+# Webtrees pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/webtrees.svg)](https://dash.yunohost.org/appci/app/webtrees) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/webtrees.maintain.svg)  
+[![Installer Webtrees avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=webtrees)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer Webtrees 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
+
+Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set.
+
+- It works from standard GEDCOM files, and is therefore compatible with every major desktop application.
+- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards.
+
+**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.
+
+
+**Version incluse :** 2.0.19~ynh1
+
+**Démo :** https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo
+
+## Captures d'écran
+
+![](./doc/screenshots/1200px-Webtrees.png)
+
+## Documentations et ressources
+
+* Site officiel de l'app : https://www.webtrees.net
+* Documentation officielle de l'admin : https://wiki.webtrees.net
+* Dépôt de code officiel de l'app : https://github.com/fisharebest/webtrees
+* Documentation YunoHost pour cette app : https://yunohost.org/app_webtrees
+* Signaler un bug : https://github.com/YunoHost-Apps/webtrees_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade webtrees -u https://github.com/YunoHost-Apps/webtrees_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps

conf/app.src

@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.0.17/webtrees-2.0.17.zip
+SOURCE_URL=https://github.com/fisharebest/webtrees/releases/download/2.0.19/webtrees-2.0.19.zip
-SOURCE_SUM=cf354f7fff855881bc9647b98a517654ded5a780d5f09737bc2bef17e1cccd71
+SOURCE_SUM=e1437a8fa9ca79a64e2fd065fad0c026e98b066e1a7bad1a30838f3b80df5b25
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true

doc/DESCRIPTION.md

@@ -0,0 +1,6 @@
+Webtrees allows you to view and edit your genealogy on your website. It has full editing capabilities, full privacy functions, and supports imedia such as photos and document images. As an online program, it fosters extended family participation and good ancestral recording habits, as it simplifies the process of collaborating with others working on your family lines. Your latest information is always on your web site and available for others to see, defined by viewing rules you set.
+
+- It works from standard GEDCOM files, and is therefore compatible with every major desktop application.
+- It aims to to be efficient and effective by using the right combination of third-party tools, design techniques and open standards.
+
+**Note:** Its better to upgrade from the Webtrees admin panel when new version arrives.

manifest.json

@@ -6,15 +6,22 @@
         "en": "Web-based genealogy application",
         "fr": "Logiciel libre de généalogie en ligne"
     },
-    "version":"2.0.17~ynh1",
+    "version":"2.0.19~ynh1",
     "url": "https://www.webtrees.net",
+    "upstream": {
+        "license": "GPL-3.0-or-later",
+        "website": "https://www.webtrees.net",
+        "demo": "https://dev.webtrees.net/demo-stable/index.php?route=%2Fdemo-stable%2Ftree%2Fdemo",
+        "admindoc": "https://wiki.webtrees.net",
+        "code": "https://github.com/fisharebest/webtrees"
+    },
     "license": "GPL-3.0-or-later",
     "maintainer": {
         "name": "Anmol Sharma",
         "email": "anmol@datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": true,
     "services": [

scripts/restore

@@ -35,8 +35,7 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=1
 
-test ! -d $final_path \
+test ! -d $final_path || ynh_die "There is already a directory: $final_path "
-	|| ynh_die "There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS

scripts/upgrade

@@ -75,14 +75,6 @@ ynh_script_progression --message="Making sure dedicated system user exists..."
 # Create a dedicated user (if not existing)
 ynh_system_user_create --username=$app --home_dir="$final_path"
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..."
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app --home_dir="$final_path"
-
 #=================================================
 # CHECK THE PATH
 #=================================================
@@ -111,11 +103,6 @@ chmod -R 700 $final_path/data
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
 
-chmod 750 "$final_path"
-chmod -R 700 $final_path/data
-chmod -R o-rwx "$final_path"
-chown -R $app:www-data "$final_path"
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================