From 6d4c0c4121a77e84f9e42bd60136a1e49071bc25 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 3 Jun 2022 16:46:02 +0200 Subject: [PATCH 1/3] 2.22.0 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 3cb589f..78fb305 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.21.1/linux-amd64-filebrowser.tar.gz -SOURCE_SUM=6b6633ea4cd4568b7120a4d22ca7a79d6868bbd8401cabe019255fe00a187d9a +SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.22.0/linux-amd64-filebrowser.tar.gz +SOURCE_SUM=4017a0c1407bbbd781d4abf4941697a802c448b2d3b818c66a978e39f96c9619 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/arm64.src b/conf/arm64.src index 94169f7..9fee4c1 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.21.1/linux-arm64-filebrowser.tar.gz -SOURCE_SUM=3e14150cd2377ac887ff83e30121e7eebecc6d68f6ee91a058c0f1ed8749c45c +SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.22.0/linux-arm64-filebrowser.tar.gz +SOURCE_SUM=26033be8f05ac10f0557647fea4f6a782e3526d5136b63c74c74a5d20e24e1c3 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/conf/armhf.src b/conf/armhf.src index 4c09e12..b92d8a1 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.21.1/linux-armv7-filebrowser.tar.gz -SOURCE_SUM=8b8673d701bce85bf71225d3b5102daac8caca85962767a217f7bb46fa603af7 +SOURCE_URL=https://github.com/filebrowser/filebrowser/releases/download/v2.22.0/linux-armv7-filebrowser.tar.gz +SOURCE_SUM=cd02b1b56be1172082421e5403582ee4e501daaf1af4afd3744170d0bf0ed9a7 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 44290ff..befb03e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Web File Browser", "fr": "Gestionnaire de fichiers" }, - "version": "2.21.1~ynh3", + "version": "2.22.0~ynh1", "url": "https://filebrowser.org", "upstream": { "license": "Apache-2.0", From b7c989a45fe4c0aab05cb9588199d30c9002e019 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 3 Jun 2022 14:48:47 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 23 +++++++++++------------ README_fr.md | 29 ++++++++++++++++------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index a00b2f3..c55186b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Filebrowser for YunoHost -[![Integration level](https://dash.yunohost.org/integration/filebrowser.svg)](https://dash.yunohost.org/appci/app/filebrowser) ![](https://ci-apps.yunohost.org/ci/badges/filebrowser.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/filebrowser.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/filebrowser.svg)](https://dash.yunohost.org/appci/app/filebrowser) ![Working status](https://ci-apps.yunohost.org/ci/badges/filebrowser.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/filebrowser.maintain.svg) [![Install Filebrowser with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=filebrowser) *[Lire ce readme en français.](./README_fr.md)* @@ -18,13 +18,11 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory. It can be used as a standalone app or as a middleware. -**Shipped version:** 2.21.1~ynh3 - - +**Shipped version:** 2.22.0~ynh1 ## Screenshots -![](./doc/screenshots/spaces_-M8KDxOujDoPpJyJJ5_i_uploads_git-blob-9390768b0cbb83b1e7da55c0ae13ecd2d8fcb114_2.PNG) +![Screenshot of Filebrowser](./doc/screenshots/spaces_-M8KDxOujDoPpJyJJ5_i_uploads_git-blob-9390768b0cbb83b1e7da55c0ae13ecd2d8fcb114_2.PNG) ## Disclaimers / important information @@ -43,21 +41,22 @@ By default, the root path is set to `/home/yunohost.app/filebrowser`. You can ch ## Documentation and resources -* Official app website: https://filebrowser.org -* Official admin documentation: https://filebrowser.org/ -* Upstream app code repository: https://github.com/filebrowser/filebrowser -* YunoHost documentation for this app: https://yunohost.org/app_filebrowser -* Report a bug: https://github.com/YunoHost-Apps/filebrowser_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/filebrowser_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/filebrowser_ynh/tree/testing --debug or sudo yunohost app upgrade filebrowser -u https://github.com/YunoHost-Apps/filebrowser_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 3481ecf..7092aae 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Filebrowser pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/filebrowser.svg)](https://dash.yunohost.org/appci/app/filebrowser) ![](https://ci-apps.yunohost.org/ci/badges/filebrowser.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/filebrowser.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/filebrowser.svg)](https://dash.yunohost.org/appci/app/filebrowser) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/filebrowser.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/filebrowser.maintain.svg) [![Installer Filebrowser avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=filebrowser) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Filebrowser 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.* @@ -14,13 +18,11 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour filebrowser provides a file managing interface within a specified directory and it can be used to upload, delete, preview, rename and edit your files. It allows the creation of multiple users and each user can have its own directory. It can be used as a standalone app or as a middleware. -**Version incluse :** 2.21.1~ynh3 - - +**Version incluse :** 2.22.0~ynh1 ## Captures d'écran -![](./doc/screenshots/spaces_-M8KDxOujDoPpJyJJ5_i_uploads_git-blob-9390768b0cbb83b1e7da55c0ae13ecd2d8fcb114_2.PNG) +![Capture d'écran de Filebrowser](./doc/screenshots/spaces_-M8KDxOujDoPpJyJJ5_i_uploads_git-blob-9390768b0cbb83b1e7da55c0ae13ecd2d8fcb114_2.PNG) ## Avertissements / informations importantes @@ -39,21 +41,22 @@ By default, the root path is set to `/home/yunohost.app/filebrowser`. You can ch ## Documentations et ressources -* Site officiel de l'app : https://filebrowser.org -* Documentation officielle de l'admin : https://filebrowser.org/ -* Dépôt de code officiel de l'app : https://github.com/filebrowser/filebrowser -* Documentation YunoHost pour cette app : https://yunohost.org/app_filebrowser -* Signaler un bug : https://github.com/YunoHost-Apps/filebrowser_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/filebrowser_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/filebrowser_ynh/tree/testing --debug ou sudo yunohost app upgrade filebrowser -u https://github.com/YunoHost-Apps/filebrowser_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 126653c941c3ed9020f7fe2476694bd1e2292dbb Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 4 Jun 2022 08:38:01 +0200 Subject: [PATCH 3/3] Update updater.sh --- .github/workflows/updater.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index e85a874..7496249 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -66,15 +66,18 @@ echo "Handling asset at $asset_url" # Here we base the source file name upon a unique keyword in the assets url (admin vs. update) # Leave $src empty to ignore the asset case $asset_url in - *"/linux-amd64-filebrowser.tar.gz") + *"linux-amd64-filebrowser.tar.gz") src="amd64" ;; - *"/linux-arm64-filebrowser.tar.gz") + *"linux-arm64-filebrowser.tar.gz") src="arm64" ;; - *"/linux-armv7-filebrowser.tar.gz") + *"linux-armv7-filebrowser.tar.gz") src="armhf" ;; + *) + src="" + ;; esac # If $src is not empty, let's process the asset @@ -104,7 +107,7 @@ SOURCE_URL=$asset_url SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true +SOURCE_IN_SUBDIR=false SOURCE_FILENAME= EOT echo "... conf/$src.src updated"