From f783f620e6cc9a778f3f7014da211a187c618899 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=98=D0=B2=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2?= <pv@calculate.ru>
Date: Wed, 18 Oct 2023 12:05:28 +0300
Subject: [PATCH] =?UTF-8?q?TG-435=20fix=20bitwarden=20=D0=B8=20floccus:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Имя переменных логина и пароля bitwarden
* Путь сохранения закладок на сервере
---
 .../www-client/chromium-80/Default/01-install-bitwarden.sh    | 4 ++--
 .../www-client/chromium-80/Default/02-install-floccus.sh      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
index 8c7bf24e6..bde4da90e 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/01-install-bitwarden.sh
@@ -1,11 +1,11 @@
-# Calculate pkg(www-plugins/chrome-bitwarden)!=&&ini(user_credentials.bitwarden_login)!=&&ini(user_credentials.bitwarden_pw)!= run=/bin/bash
+# Calculate pkg(www-plugins/chrome-bitwarden)!=&&ini(user_credentials.walutwarden_login)!=&&ini(user_credentials.waultwarden_pw)!= run=/bin/bash
 
 plugin_id="nngceckbapebfimnlniiiahkandclblb"
 mkdir -p #-ur_home_path-#/.config/chromium/Default/Extensions/${plugin_id}
 mkdir -p "#-ur_home_path-#/.config/chromium/Default/Local Extension Settings" &>/dev/null
 cp -r /usr/share/chrome-bitwarden/* #-ur_home_path-#/.config/chromium/Default/Extensions/$plugin_id
 
-/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.bitwarden_login)-#" "#-ini(user_credentials.bitwarden_pw)-#" &>/dev/null <<EOF
+/usr/share/chrome-bitwarden/configure.py #-ur_home_path-#/.config/chromium $plugin_id "#-ini(user_credentials.waultwarden_login)-#" "#-ini(user_credentials.waultwarden_pw)-#" &>/dev/null <<EOF
 {
     "userId": {
 	"data": {
diff --git a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
index 9b8b914dc..72db8aaf0 100644
--- a/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
+++ b/profiles/templates/6_ac_desktop_profile/2-user/www-client/chromium-80/Default/02-install-floccus.sh
@@ -13,7 +13,7 @@ cp -r /usr/share/chrome-floccus/* #-ur_home_path-#/.config/chromium/Default/Exte
 	    "url": "#-ini(user_credentials.nextcloud_url)-#",
 	    "username": "#-ini(user_credentials.nextcloud_login)-#",
 	    "password": "#-ini(user_credentials.nextcloud_pw)-#",
-	    "serverRoot": "/apps/bookmarks",
+	    "serverRoot": "",
 	    "includeCredentials": false,
 	    "allowRedirects": false,
 	    "allowNetwork": false,