Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-08-02 03:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Replace qdbus with qdbus6 and kwalletd5 with kwalletd6

Browse source
This commit is contained in:
hueychen27 2025-06-07 15:42:40 -07:00 • committed by Jonathan White
parent db0f091536
commit eac95df000
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/keepassxc-kdewallet
View file

@ -9,14 +9,14 @@ KEEPASSXC=$(which -a keepassxc | sed -e "\\,$0,d" -e 'q')
daemon_main() { daemon_main() {
# open kdewallet # open kdewallet
handle=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.open kdewallet 0 "$PROG") handle=$(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 open kdewallet 0 "$PROG")
while [[ true != $(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.isOpen kdewallet) ]]; do while [[ true != $(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 isOpen kdewallet) ]]; do
sleep 1 sleep 1
done done
declare -A DBs declare -A DBs
for DBPATH in $(ls -r $KDBX_SEARCH); do for DBPATH in $(ls -r $KDBX_SEARCH); do
DBs[$(realpath $DBPATH)]=$(qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.readPassword "$handle" "Passwords" "${DBPATH##*/}" "$PROG") DBs[$(realpath $DBPATH)]=$(qdbus6 org.kde.kwalletd6 /modules/kwalletd6 readPassword "$handle" "Passwords" "${DBPATH##*/}" "$PROG")
done done
# launch real keepassxc # launch real keepassxc
@ -24,7 +24,7 @@ daemon_main() {
"$KEEPASSXC" --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" & "$KEEPASSXC" --pw-stdin "${!DBs[@]}" <<<"${DBs[*]}" &
# done with kdewallet # done with kdewallet
qdbus org.kde.kwalletd5 /modules/kwalletd5 org.kde.KWallet.close "$handle" "false" "$PROG" qdbus6 org.kde.kwalletd6 /modules/kwalletd6 close "$handle" "false" "$PROG"
} }
if [[ $1 == '-d' ]]; then if [[ $1 == '-d' ]]; then