diff --git a/Database - C940-inator.kdbx b/Database - C940-inator.kdbx index bd12757..0520ea4 100644 Binary files a/Database - C940-inator.kdbx and b/Database - C940-inator.kdbx differ diff --git a/Database - C940.kdbx b/Database - C940.kdbx index 2bc0861..efbcd39 100644 Binary files a/Database - C940.kdbx and b/Database - C940.kdbx differ diff --git a/Database - JIX.kdbx b/Database - JIX.kdbx index dbdad7f..ff547ed 100644 Binary files a/Database - JIX.kdbx and b/Database - JIX.kdbx differ diff --git a/Database - Keeweb.kdbx b/Database - Keeweb.kdbx index 23093c0..4a90699 100644 Binary files a/Database - Keeweb.kdbx and b/Database - Keeweb.kdbx differ diff --git a/Database - PocoF1.kdbx b/Database - PocoF1.kdbx index 2bc5225..f803a5a 100644 Binary files a/Database - PocoF1.kdbx and b/Database - PocoF1.kdbx differ diff --git a/Database - desktop.kdbx b/Database - desktop.kdbx index 8656515..dc66c02 100644 Binary files a/Database - desktop.kdbx and b/Database - desktop.kdbx differ diff --git a/Database - global.kdbx b/Database - global.kdbx index 8b7d16d..c4659db 100644 Binary files a/Database - global.kdbx and b/Database - global.kdbx differ diff --git a/Database - laptop.kdbx b/Database - laptop.kdbx index 23093c0..b0e063b 100644 Binary files a/Database - laptop.kdbx and b/Database - laptop.kdbx differ diff --git a/Database - laptop_linux.kdbx b/Database - laptop_linux.kdbx index 23093c0..5515083 100644 Binary files a/Database - laptop_linux.kdbx and b/Database - laptop_linux.kdbx differ diff --git a/Database - linux.kdbx b/Database - linux.kdbx index 23093c0..5e431ab 100644 Binary files a/Database - linux.kdbx and b/Database - linux.kdbx differ diff --git a/Database - tmp.kdbx b/Database - tmp.kdbx index 23093c0..bbd6465 100644 Binary files a/Database - tmp.kdbx and b/Database - tmp.kdbx differ diff --git a/KeeShare.kdbx - Copy.share b/KeeShare.kdbx - Copy.share deleted file mode 100644 index 0722227..0000000 Binary files a/KeeShare.kdbx - Copy.share and /dev/null differ diff --git a/KeeShare.kdbx.share b/KeeShare.kdbx.share index 1f192a6..df755b4 100644 Binary files a/KeeShare.kdbx.share and b/KeeShare.kdbx.share differ diff --git a/merge_all_databases.sh b/merge_all_databases.sh new file mode 100755 index 0000000..04e64c8 --- /dev/null +++ b/merge_all_databases.sh @@ -0,0 +1,48 @@ +#!/bin/bash +# Read Password +echo -n "Password: " +read -s PASSWORD +echo + +FILES=$(find . -name '*.kdbx' -print) +MERGES=$(echo "$FILES" | wc -l) +COUNT=0 +GLOBAL='./Database - global.kdbx'; +IFS=$'\n' + +MERGES=$((MERGES*2-2)) +# Merge all to global +for FILE in $FILES +do + if [ "$FILE" != "$GLOBAL" ]; + then + echo "$FILE" + echo $PASSWORD | keepassxc-cli merge -q -s "$GLOBAL" "$FILE" 2> /dev/null + echo -ne $((++COUNT))"/$MERGES"\\r + fi +done +# Merge all from global +for FILE in $FILES +do + if [ "$FILE" != "$GLOBAL" ]; + then + echo "$FILE" + echo $PASSWORD | keepassxc-cli merge -q -s "$FILE" "$GLOBAL" 2> /dev/null + echo -ne $((++COUNT))"/$MERGES"\\r + fi +done + +# Merge all to all +#MERGES=$(($MERGES**2-$MERGES)) +#for FILE1 in $FILES +#do +# for FILE2 in $FILES +# do +# if [ "$FILE1" != "$FILE2" ]; +# then +# echo $PASSWORD | keepassxc-cli merge -q -s "$FILE1" "$FILE2" 2> /dev/null +# echo -ne $((++COUNT))"/$MERGES"\\r +# fi +# done +#done +echo;