Merge pull request #49 from YunoHost-Apps/fix_setup_source_syntax

Fix app.src / ynh_setup_source usage

README.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Monitorix for YunoHost
 
 [![Integration level](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![Working status](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)
+
 [![Install Monitorix with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monitorix)
 
 *[Lire ce readme en français.](./README_fr.md)*
@@ -18,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible. It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Shipped version:** 3.15.0~ynh2
+**Shipped version:** 3.15.0~ynh3
 
 **Demo:** https://www.fibranet.cat/monitorix/
 

README_fr.md

@@ -6,6 +6,7 @@ It shall NOT be edited by hand.
 # Monitorix pour YunoHost
 
 [![Niveau d’intégration](https://dash.yunohost.org/integration/monitorix.svg)](https://dash.yunohost.org/appci/app/monitorix) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/monitorix.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/monitorix.maintain.svg)
+
 [![Installer Monitorix avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=monitorix)
 
 *[Read this readme in english.](./README.md)*
@@ -18,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 Monitorix is a free, open source, lightweight system monitoring tool designed to monitor as many services and system resources as possible. It has been created to be used under production Linux/UNIX servers, but due to its simplicity and small size can be used on embedded devices as well.
 
 
-**Version incluse :** 3.15.0~ynh2
+**Version incluse :** 3.15.0~ynh3
 
 **Démo :** https://www.fibranet.cat/monitorix/
 

conf/app.src

@@ -1,17 +1,5 @@
 SOURCE_URL=https://www.monitorix.org/monitorix_3.15.0-izzy1_all.deb
 SOURCE_SUM=0d960b9433ecbaba38d9befe27163644886fb5a466d44f5380576ca975b9d8e4
-# (Optional) Program to check the integrity (sha256sum, md5sum...)
-# default: sha256
-SOURCE_SUM_PRG=sha256sum
-# (Optional) Archive format
-# default: tar.gz
 SOURCE_FORMAT=deb
-# (Optional) Put false if sources are directly in the archive root
-# default: true
-# Instead of true, SOURCE_IN_SUBDIR could be the number of sub directories
-# to remove.
-SOURCE_IN_SUBDIR=false
-# (Optional) If it set as false don't extract the source.
-# (Useful to get a debian package or a python wheel.)
-# default: true
 SOURCE_EXTRACT=false
+SOURCE_FILENAME=monitorix.deb

manifest.json

@@ -6,7 +6,7 @@
         "en": "A monitoring tools",
         "fr": "Un outils de monitoring"
     },
-    "version": "3.15.0~ynh2",
+    "version": "3.15.0~ynh3",
     "url": "http://monitorix.org",
     "upstream": {
         "license": "GPL-2.0",

scripts/_common.sh

@@ -17,7 +17,7 @@ get_install_source() {
 	ynh_setup_source --dest_dir /tmp
 
 	ynh_package_update
-	dpkg --force-confdef --force-confold -i /tmp/app.deb
+	dpkg --force-confdef --force-confold -i /tmp/monitorix.deb
 	ynh_secure_remove --file=/etc/monitorix/conf.d/00-debian.conf
 	ynh_package_install -f
 }