diff --git a/README.md b/README.md index 93fef86..54993a2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Bitwarden for YunoHost [![Integration level](https://dash.yunohost.org/integration/bitwarden.svg)](https://dash.yunohost.org/appci/app/bitwarden) ![](https://ci-apps.yunohost.org/ci/badges/bitwarden.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/bitwarden.maintain.svg) -[![Install Bitwarden with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bitwarden) +[![Install Bitwarden with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=bitwarden) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 0141049..fa91029 100644 --- a/README_fr.md +++ b/README_fr.md @@ -15,7 +15,7 @@ Bitwarden est un gestionnaire de mots de passe open source. ## Points importants à lire avant l'installation -Après l'installation, l'utilisateur admin recevra un e-mail avec le admin_token a utilisé pour accéder à l'administration de Bitwarden https://your.domain.tld/bitwarden/admin. +Après l'installation, l'utilisateur admin recevra un e-mail avec le admin_token à utiliser pour accéder à l'administration de Bitwarden https://your.domain.tld/bitwarden/admin. ## Captures d'écran diff --git a/check_process b/check_process index 78433bc..62eb9a6 100644 --- a/check_process +++ b/check_process @@ -18,15 +18,17 @@ setup_public=1 upgrade=1 # 1.9.1~ynh3 - #upgrade=1 from_commit=501bf18eafcda987ac255d12ca213d15e63c5eef + # upgrade=1 from_commit=501bf18eafcda987ac255d12ca213d15e63c5eef # 1.14.2~ynh2 - #upgrade=1 from_commit=2a7b9d6b6705be6e3a7217309a77b9def226eaa6 + # upgrade=1 from_commit=2a7b9d6b6705be6e3a7217309a77b9def226eaa6 # 1.15.1~ynh2 - #upgrade=1 from_commit=bb9dac9cc50e11d8ef60033a543f9e21b42d0d8e + # upgrade=1 from_commit=bb9dac9cc50e11d8ef60033a543f9e21b42d0d8e # 1.16.1~ynh2 upgrade=1 from_commit=5572d0420cf500fdb313c15b4ab40e7a6c38e294 # 1.16.3~ynh1 upgrade=1 from_commit=576a173a43de914253645daa2c0b066f693a20f7 + # 1.16.3~ynh2 + upgrade=1 from_commit=e2e958b1885f7a08e0d5afe5dada5c0dd44dd671 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -50,3 +52,5 @@ Notification=all name=1.16.1~ynh2 ; commit=576a173a43de914253645daa2c0b066f693a20f7 name=1.16.3~ynh1 + ; commit=e2e958b1885f7a08e0d5afe5dada5c0dd44dd671 + name=1.16.3~ynh2 diff --git a/manifest.json b/manifest.json index ec7163d..fbf89e7 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Manage passwords and other sensitive informations", "fr": "Gérez les mots de passe et autres informations sensibles" }, - "version": "1.16.3~ynh2", + "version": "1.16.3~ynh3", "url": "https://github.com/dani-garcia/bitwarden_rs", "license": "GPL-3.0-or-later", "maintainer": { diff --git a/scripts/install b/scripts/install index f80adcd..60a3bde 100644 --- a/scripts/install +++ b/scripts/install @@ -61,7 +61,7 @@ ynh_app_setting_set --app=$app --key=admin_token --value=$admin_token #================================================= # FIND AND OPEN A PORT #================================================= -ynh_script_progression --message="Configuring firewall..." +ynh_script_progression --message="Finding an available port..." # Find an available port websocket_port=$(ynh_find_port --port=3012) @@ -119,7 +119,7 @@ chown -R "$app":"$app" "$final_path" # Install rustup with the toolchain needed by bitwarden_rs pushd "$final_path" - sudo -u "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=$(cat build/rust-toolchain)' + sudo -u "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain nightly' popd export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" diff --git a/scripts/upgrade b/scripts/upgrade index 0ffc03e..9aa61c1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -109,7 +109,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ] then # Install rustup with the toolchain needed by bitwarden_rs pushd "$final_path" - sudo -u "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=$(cat build/rust-toolchain)' + sudo -u "$app" RUSTUP_HOME="$final_path"/.rustup CARGO_HOME="$final_path"/.cargo bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain nightly' popd export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"