diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 983d333..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/README.md b/README.md index 06b81d1..2c975e2 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Miniflux for YunoHost -[![Integration level](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![Working status](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg) [![Install Miniflux with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux) *[Lire ce readme en français.](./README_fr.md)* @@ -17,13 +17,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Minimalist and opinionated RSS feed reader -**Shipped version:** 2.0.36~ynh1 - - +**Shipped version:** 2.0.37~ynh1 ## Screenshots -![](./doc/screenshots/overview.png) +![Screenshot of Miniflux](./doc/screenshots/overview.png) ## Disclaimers / important information @@ -32,21 +30,22 @@ Minimalist and opinionated RSS feed reader You can also configure Miniflux by editing this file `/var/www/miniflux/miniflux.conf` using the [documentation](https://miniflux.app/docs/configuration.html). ## Documentation and resources -* Official app website: https://miniflux.app/ -* Official admin documentation: https://miniflux.app/docs/index.html -* Upstream app code repository: https://github.com/miniflux/v2 -* YunoHost documentation for this app: https://yunohost.org/app_miniflux -* Report a bug: https://github.com/YunoHost-Apps/miniflux_ynh/issues +* Official app website: +* Official admin documentation: +* Upstream app code repository: +* YunoHost documentation for this app: +* Report a bug: ## Developer info Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug or sudo yunohost app upgrade miniflux -u https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug ``` -**More info regarding app packaging:** https://yunohost.org/packaging_apps \ No newline at end of file +**More info regarding app packaging:** diff --git a/README_fr.md b/README_fr.md index 7ac2518..e297a65 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Miniflux pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/miniflux.svg)](https://dash.yunohost.org/appci/app/miniflux) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/miniflux.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/miniflux.maintain.svg) [![Installer Miniflux avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=miniflux) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Miniflux 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.* @@ -13,13 +17,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Minimalist and opinionated RSS feed reader -**Version incluse :** 2.0.36~ynh1 - - +**Version incluse :** 2.0.37~ynh1 ## Captures d'écran -![](./doc/screenshots/overview.png) +![Capture d'écran de Miniflux](./doc/screenshots/overview.png) ## Avertissements / informations importantes @@ -28,21 +30,22 @@ Minimalist and opinionated RSS feed reader Vous pouvez configurer Miniflux en modifiant le fichier `/var/www/miniflux/miniflux.conf` en vous aidant de la [documentation](https://miniflux.app/docs/configuration.html). ## Documentations et ressources -* Site officiel de l'app : https://miniflux.app/ -* Documentation officielle de l'admin : https://miniflux.app/docs/index.html -* Dépôt de code officiel de l'app : https://github.com/miniflux/v2 -* Documentation YunoHost pour cette app : https://yunohost.org/app_miniflux -* Signaler un bug : https://github.com/YunoHost-Apps/miniflux_ynh/issues +* Site officiel de l'app : +* Documentation officielle de l'admin : +* Dépôt de code officiel de l'app : +* Documentation YunoHost pour cette app : +* Signaler un bug : ## Informations pour les développeurs Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug ou sudo yunohost app upgrade miniflux -u https://github.com/YunoHost-Apps/miniflux_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps \ No newline at end of file +**Plus d'infos sur le packaging d'applications :** diff --git a/conf/amd64.src b/conf/amd64.src index fc8c0bd..4e09a4d 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.36/miniflux-linux-amd64 -SOURCE_SUM=77e5a0e219a0cc2a7f856165757944681a9ebb39474e24cb8d0ad0c2c1502742 +SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.37/miniflux-linux-amd64 +SOURCE_SUM=d4f6e63cbeca895181e1c47180c70a75a0dedb636ed2a558d44dc26260557cba SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=miniflux diff --git a/conf/arm64.src b/conf/arm64.src index 102cd2b..e767ffa 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.36/miniflux-linux-arm64 -SOURCE_SUM=95ace98c8413a099c2ed97a6e9c13db81e8769ddf522b6d5a1bf95c197a6d992 +SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.37/miniflux-linux-arm64 +SOURCE_SUM=a7958b9fec7d0819af6ee7b8459a3c842dc86db6b65c12b2d5426a57d0e3cd3c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=miniflux diff --git a/conf/armhf.src b/conf/armhf.src index 566a8bb..6816c96 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.36/miniflux-linux-armv7 -SOURCE_SUM=db6f983294658f4d68961300dd3c6bee26a051c396968611f3852bd41d08ba24 +SOURCE_URL=https://github.com/miniflux/v2/releases/download/2.0.37/miniflux-linux-armv7 +SOURCE_SUM=1d300a4a60eace0fc2cd4c2efc00632451db53f3d1c21fe93a28c5002c45dcd2 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=miniflux diff --git a/manifest.json b/manifest.json index b7ce722..967d895 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Minimalist and opinionated RSS feed reader", "fr": "Agrégateur de flux RSS minimaliste" }, - "version": "2.0.36~ynh1", + "version": "2.0.37~ynh1", "url": "https://miniflux.app/", "upstream": { "license": "Apache-2.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 52491aa..91f698b 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # dependencies used by the app -pkg_dependencies="postgresql apt-transport-https" +pkg_dependencies="postgresql" #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 3e98d1d..1e8c1d9 100644 --- a/scripts/install +++ b/scripts/install @@ -23,7 +23,6 @@ ynh_abort_if_errors domain=$YNH_APP_ARG_DOMAIN path_url=$YNH_APP_ARG_PATH is_public=$YNH_APP_ARG_IS_PUBLIC -architecture=$YNH_ARCH password=$YNH_APP_ARG_PASSWORD admin=$YNH_APP_ARG_ADMIN @@ -49,7 +48,6 @@ ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url ynh_app_setting_set --app=$app --key=admin --value=$admin ynh_app_setting_set --app=$app --key=password --value=$password -ynh_app_setting_set --app=$app --key=architecture --value=$architecture #================================================= # STANDARD MODIFICATIONS @@ -96,7 +94,7 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" +ynh_setup_source --dest_dir="$final_path" --source_id=$YNH_ARCH chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 8fe5a72..fdb5cd1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -20,7 +20,6 @@ domain=$(ynh_app_setting_get --app=$app --key=domain) path_url=$(ynh_app_setting_get --app=$app --key=path) final_path=$(ynh_app_setting_get --app=$app --key=final_path) port=$(ynh_app_setting_get --app=$app --key=port) -architecture=$YNH_ARCH db_name=$(ynh_app_setting_get --app=$app --key=db_name) db_user=$db_name db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd) @@ -84,7 +83,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir=$final_path --source_id="$architecture" --keep="$final_path/$app.conf" + ynh_setup_source --dest_dir=$final_path --source_id=$YNH_ARCH --keep="$final_path/$app.conf" fi chmod 750 "$final_path"