From 7f8f3e30a626a3324579ab95fab4730e794417b4 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Fri, 27 May 2022 00:09:46 +0200 Subject: [PATCH 1/2] Update updater.sh --- .github/workflows/updater.sh | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 977d7b8..2ed9f2c 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -9,9 +9,6 @@ # Since each app is different, maintainers can adapt its contents so as to perform # automatic actions when a new upstream release is detected. -# Remove this exit command when you are ready to run this Action -#exit 1 - #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS #================================================= @@ -36,6 +33,7 @@ fi echo "Current version: $current_version" echo "Latest release from upstream: $version" echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV # For the time being, let's assume the script will fail echo "PROCEED=false" >> $GITHUB_ENV @@ -68,43 +66,42 @@ for asset_url in ${assets[@]}; do # 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 - *"vaultwarden"*) + *"vaultwarden"*) src="app" ;; - *"bw_web_builds"*) + *"bw_web_builds"*) src="web" ;; - *) + *) src="" ;; esac # If $src is not empty, let's process the asset if [ ! -z "$src" ]; then - # Create the temporary directory tempdir="$(mktemp -d)" # Download sources and calculate checksum filename=${asset_url##*/} curl --silent -4 -L $asset_url -o "$tempdir/$filename" - checksum=$(sha512sum "$tempdir/$filename" | head -c 64) + checksum=$(sha256sum "$tempdir/$filename" | head -c 64) # Delete temporary directory rm -rf $tempdir # Get extension if [[ $filename == *.tar.gz ]]; then - extension=tar.gz + extension=tar.gz else - extension=${filename##*.} + extension=${filename##*.} fi # Rewrite source file cat < conf/$src.src SOURCE_URL=$asset_url SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha512sum +SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= From 3c5efc0a57305a72f62fc9c2cd2e3d11d6016e9f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 26 May 2022 22:09:51 +0000 Subject: [PATCH 2/2] 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 e2fac6a..c6398b9 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Vaultwarden for YunoHost -[![Integration level](https://dash.yunohost.org/integration/vaultwarden.svg)](https://dash.yunohost.org/appci/app/vaultwarden) ![](https://ci-apps.yunohost.org/ci/badges/vaultwarden.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/vaultwarden.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/vaultwarden.svg)](https://dash.yunohost.org/appci/app/vaultwarden) ![Working status](https://ci-apps.yunohost.org/ci/badges/vaultwarden.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/vaultwarden.maintain.svg) [![Install Vaultwarden with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vaultwarden) *[Lire ce readme en français.](./README_fr.md)* @@ -23,7 +23,7 @@ Alternative implementation of the Bitwarden server API written in Rust and compa ## Screenshots -![](./doc/screenshots/screenshot1.png) +![Screenshot of Vaultwarden](./doc/screenshots/screenshot1.png) ## Disclaimers / important information @@ -49,21 +49,22 @@ The `--debug` option will let you see the full output. If you encounter any issu ## Documentation and resources -* Official user documentation: https://help.bitwarden.com/ -* Official admin documentation: https://github.com/dani-garcia/vaultwarden/wiki -* Upstream app code repository: https://github.com/dani-garcia/vaultwarden -* YunoHost documentation for this app: https://yunohost.org/app_vaultwarden -* Report a bug: https://github.com/YunoHost-Apps/vaultwarden_ynh/issues +* Official user documentation: +* 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/vaultwarden_ynh/tree/testing). To try the testing branch, please proceed like that. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/vaultwarden_ynh/tree/testing --debug or sudo yunohost app upgrade vaultwarden -u https://github.com/YunoHost-Apps/vaultwarden_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 e81cc48..30aa17b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,10 +1,14 @@ + + # Vaultwarden pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/vaultwarden.svg)](https://dash.yunohost.org/appci/app/vaultwarden) ![](https://ci-apps.yunohost.org/ci/badges/vaultwarden.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/vaultwarden.maintain.svg) +[![Niveau d'intégration](https://dash.yunohost.org/integration/vaultwarden.svg)](https://dash.yunohost.org/appci/app/vaultwarden) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/vaultwarden.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/vaultwarden.maintain.svg) [![Installer Vaultwarden avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=vaultwarden) *[Read this readme in english.](./README.md)* -*[Lire ce readme en français.](./README_fr.md)* > *Ce package vous permet d'installer Vaultwarden 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.* @@ -19,7 +23,7 @@ Alternative implementation of the Bitwarden server API written in Rust and compa ## Captures d'écran -![](./doc/screenshots/screenshot1.png) +![Capture d'écran de Vaultwarden](./doc/screenshots/screenshot1.png) ## Avertissements / informations importantes @@ -45,21 +49,22 @@ The `--debug` option will let you see the full output. If you encounter any issu ## Documentations et ressources -* Documentation officielle utilisateur : https://help.bitwarden.com/ -* Documentation officielle de l'admin : https://github.com/dani-garcia/vaultwarden/wiki -* Dépôt de code officiel de l'app : https://github.com/dani-garcia/vaultwarden -* Documentation YunoHost pour cette app : https://yunohost.org/app_vaultwarden -* Signaler un bug : https://github.com/YunoHost-Apps/vaultwarden_ynh/issues +* Documentation officielle utilisateur : +* 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/vaultwarden_ynh/tree/testing). Pour essayer la branche testing, procédez comme suit. -``` + +``` bash sudo yunohost app install https://github.com/YunoHost-Apps/vaultwarden_ynh/tree/testing --debug ou sudo yunohost app upgrade vaultwarden -u https://github.com/YunoHost-Apps/vaultwarden_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 :**