From 79368b7c4765e3cc446b1c88c6afd399c8d90eea Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 May 2022 15:34:41 +0000 Subject: [PATCH 1/4] Auto-update README --- README.md | 19 ++++++++++--------- README_fr.md | 25 +++++++++++++++---------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 79949e0..46c9f7c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Yourls for YunoHost -[![Integration level](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![Working status](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg) [![Install Yourls with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yourls) *[Lire ce readme en français.](./README_fr.md)* @@ -35,25 +35,26 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d ## Screenshots -![](./doc/screenshots/p4.png) +![Screenshot of Yourls](./doc/screenshots/p4.png) ## Documentation and resources -* Official app website: https://yourls.org/ -* Official admin documentation: https://docs.yourls.org/ -* Upstream app code repository: https://github.com/YOURLS/YOURLS -* YunoHost documentation for this app: https://yunohost.org/app_yourls -* Report a bug: https://github.com/YunoHost-Apps/yourls_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/yourls_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yourls_ynh/tree/testing --debug or sudo yunohost app upgrade yourls -u https://github.com/YunoHost-Apps/yourls_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 b807017..0c59d23 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Yourls pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/yourls.svg)](https://dash.yunohost.org/appci/app/yourls) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/yourls.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/yourls.maintain.svg) [![Installer Yourls avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=yourls) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Yourls 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.* @@ -31,25 +35,26 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d ## Captures d'écran -![](./doc/screenshots/p4.png) +![Capture d'écran de Yourls](./doc/screenshots/p4.png) ## Documentations et ressources -* Site officiel de l'app : https://yourls.org/ -* Documentation officielle de l'admin : https://docs.yourls.org/ -* Dépôt de code officiel de l'app : https://github.com/YOURLS/YOURLS -* Documentation YunoHost pour cette app : https://yunohost.org/app_yourls -* Signaler un bug : https://github.com/YunoHost-Apps/yourls_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/yourls_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/yourls_ynh/tree/testing --debug ou sudo yunohost app upgrade yourls -u https://github.com/YunoHost-Apps/yourls_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 :** From 0e291bd311954896388fe82b6162b8695639f5d3 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 May 2022 17:38:24 +0200 Subject: [PATCH 2/4] filter --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index ea65942..483e0a9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/YOURLS/YOURLS/archive/1.9.zip -SOURCE_SUM=5923947ce07074b0c21ef73f6a2f6b5b0708d446029fffb0218baebe1f9a6956 +SOURCE_URL=https://github.com/YOURLS/YOURLS/archive/1.9.1.zip +SOURCE_SUM=100257e29d7e415bdd309eff677b899c11814ef8a920df06b6b701c0abe002fd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f402f15..f39b31d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "URL shortening service", "fr": "Service de raccourcisseur d'URL" }, - "version": "1.9~ynh2", + "version": "1.9.1~ynh1", "url": "https://yourls.org/", "upstream": { "license": "MIT", From 3dfe3855b1849acd3313bfd829fb10e54776feaf Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 29 May 2022 15:38:46 +0000 Subject: [PATCH 3/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 46c9f7c..cdd829b 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Shipped version:** 1.9~ynh2 +**Shipped version:** 1.9.1~ynh1 **Demo:** https://yourls.org/cookie+ diff --git a/README_fr.md b/README_fr.md index 0c59d23..bd18ad7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -29,7 +29,7 @@ Running your own URL shortener is fun, geeky and useful: you own your data and d - Sample files to create your own public interface -**Version incluse :** 1.9~ynh2 +**Version incluse :** 1.9.1~ynh1 **Démo :** https://yourls.org/cookie+ From db16fecb47adc2ca16b04b554215f16fa5df0b01 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 29 May 2022 18:05:11 +0200 Subject: [PATCH 4/4] Update _common.sh --- scripts/_common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 35190ba..e8e24e3 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,10 +4,10 @@ # COMMON VARIABLES #================================================= -YNH_PHP_VERSION="7.4" +YNH_PHP_VERSION="8.0" # dependencies used by the app -pkg_dependencies="php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml" +pkg_dependencies="php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-bcmath php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-xml" #================================================= # PERSONAL HELPERS