diff options
| author | Olivier Tilloy <olivier.tilloy@canonical.com> | 2020-07-17 10:14:26 +0200 |
|---|---|---|
| committer | Olivier Tilloy <olivier.tilloy@canonical.com> | 2020-07-17 10:14:26 +0200 |
| commit | 7006e1380ec753e98ce3f066c5a0e642842dd515 (patch) | |
| tree | 3011477cb42708320d45ff94a7252a6b9e1b1dd6 | |
| parent | 91e623624e3cca87bbadfa7db567059d6b8b1ef8 (diff) | |
Use 'snapctl is-connected password-manager-service' instead of D-Bus calls.
| -rwxr-xr-x | launcher/chromium.launcher | 8 | ||||
| -rw-r--r-- | snapcraft.yaml | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/launcher/chromium.launcher b/launcher/chromium.launcher index a4b93a1..e76849a 100755 --- a/launcher/chromium.launcher +++ b/launcher/chromium.launcher @@ -53,14 +53,8 @@ fi # default password store for the current desktop environment. # Ref: https://launchpad.net/bugs/1763829 PASSWORD_STORE=basic -dbus-send --session --dest=org.freedesktop.secrets /org/freedesktop/secrets --print-reply org.freedesktop.DBus.Properties.GetAll string:'org.freedesktop.Secret.Service' >/dev/null 2>&1 -if [ "$?" -eq "0" ]; then +if snapctl is-connected password-manager-service; then PASSWORD_STORE= # an empty string means detect the store based on the current DE (os_crypt::SelectBackend()) -else - dbus-send --session --dest=org.kde.kwalletd5 /modules/kwalletd5 --print-reply org.freedesktop.DBus.Properties.GetAll string:'org.kde.KWallet' >/dev/null 2>&1 - if [ "$?" -eq "0" ]; then - PASSWORD_STORE= # an empty string means detect the store based on the current DE (os_crypt::SelectBackend()) - fi fi # Allow chromium to look for the flash player plugin inside the snap's diff --git a/snapcraft.yaml b/snapcraft.yaml index 7d1d06e..b7acfcf 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -6,6 +6,8 @@ description: | stable way for all Internet users to experience the web. confinement: strict base: core18 +assumes: + - snapd2.43 # for 'snapctl is-connected', used in chromium.launcher apps: chromium: |