diff --git a/Certificate.key.share b/Certificate.key.share new file mode 100644 index 0000000..2a10bda --- /dev/null +++ b/Certificate.key.share @@ -0,0 +1,8 @@ + + + AAAAB3NzaC1yc2EAAAEArYERMg/Ya5gWfKTvqBtmKqO53aHcCtGjl8mL2u7n4s/L/uxI4oixVF2j4QO3fGgTeclzN5WRjDJjTsI26x1Gchv4yA/XG5Q9kJa71/Jxi1P+uCFlKzvugU3mWtGscbvNtcAInoQ8ojElKE79DGVGK5LkGI+xoGz8AsmGo+u+juvaDYCQz5LV+n7xWLxVxuFeTGF4YQEegGHdk+0DrjAAdVtqvuzHWPYsNd53or0hzYAAR2uAwTOa7yyEYX07E8rgN1sOX7JXpTvbHA9LFUOpx0WASyNRiKCa+lGY36U/EqRWCcXDKBxDzUCREwswGcmneiapVWRwNlolNU6OexLVUQAAAAMBAAEAAAEAVSuVcFi86Vw4NamVh5UjmuzSMYziAmGUh89FGwzJwdo1jocY5DMrsXliF/QGH0jLvq34JCIE16hofWHzKYkuapd2kWbNNlmXuyFzRndZ64Yo9ORX0FhUJR9DY/OnThFd0slYsc/CH/A2CEp2B56zSnKKC9CF5nV5ZDjfIhp4aZln7gS4tsX0yftD5HaNM5c5jBNcBMXcJeJMz7mnfUkyfVdsbjc6qDO3VW6OvgVOboKuWk5/J8c4WdECkmn5l98EY9cShSTkFxr9Dy5RdaOy4Mb4cCm+F8348vXdn7C7jzViK00fNTEVJcCZenhJQYYFnVrsF6khLKV/ZOHrF2SevQAAAIB0AtOo1M3xBnZVQn8nUd66bgmb2umMN0rqLXcbvzCfYnoYjVvZlac3ediI4qvoY+t7+qjQNIQwL9wZcuFFJgdDSabyKrMww9JlI8EAYkAC1F1HlOJAh4J5iriVi+mVntEH5a1RBsbypD8VlENx1xFEzR91exGijPxku/6vBGtc2AAAAIDDrqLYcv8WRsHiH0opkoMMtMw6YieBhKpktwxqO+xxVQBdMysJ7lYik4OYCkNhmVhf3NZQX65mwt1ZHREtMUdRgCZd0C6vR96cXOEPkRVnEy+f3zhn6seDm7JEx2zWIA2CnjNO/OuBSCIihty1C/kH6f3kmm6eQe0DOaJNfv7FQwAAAIDi/Fr1AnQQziIOiMVCZZcJ3GyB0OeQNKIJf2m+rAF/djexEzAUTP8Z8iMzlxMenuM1llmfo+QCFqNfN+ByvTZcI5lRLC+PqitPhRJ0ruUqwXB2fZTwHQ5D3k0z4uLx1SWeqiW6CnN7CAV5sAAC3aFUtkuQHmk4hT893PJR1APH2w== + + knyffen + AAAAB3NzaC1yc2EAAAADAQABAAABAK2BETIP2GuYFnyk76gbZiqjud2h3ArRo5fJi9ru5+LPy/7sSOKIsVRdo+EDt3xoE3nJczeVkYwyY07CNusdRnIb+MgP1xuUPZCWu9fycYtT/rghZSs77oFN5lrRrHG7zbXACJ6EPKIxJShO/QxlRiuS5BiPsaBs/ALJhqPrvo7r2g2AkM+S1fp+8Vi8VcbhXkxheGEBHoBh3ZPtA64wAHVbar7sx1j2LDXed6K9Ic2AAEdrgMEzmu8shGF9OxPK4DdbDl+yV6U72xwPSxVDqcdFgEsjUYigmvpRmN+lPxKkVgnFwygcQ81AkRMLMBnJp3omqVVkcDZaJTVOjnsS1VE= + + diff --git a/Database - C940-inator.kdbx b/Database - C940-inator.kdbx deleted file mode 100644 index 0520ea4..0000000 Binary files a/Database - C940-inator.kdbx and /dev/null differ diff --git a/Database - C940.kdbx b/Database - C940.kdbx index efbcd39..923a5f5 100644 Binary files a/Database - C940.kdbx and b/Database - C940.kdbx differ diff --git a/Database - JIX.kdbx b/Database - JIX.kdbx index ff547ed..4863bb5 100644 Binary files a/Database - JIX.kdbx and b/Database - JIX.kdbx differ diff --git a/Database - Keeweb.kdbx b/Database - Keeweb.kdbx deleted file mode 100644 index 4a90699..0000000 Binary files a/Database - Keeweb.kdbx and /dev/null differ diff --git a/Database - PocoF1.kdbx b/Database - PocoF1.kdbx index f803a5a..7c5df92 100644 Binary files a/Database - PocoF1.kdbx and b/Database - PocoF1.kdbx differ diff --git a/Database - SteamDeck.kdbx b/Database - SteamDeck.kdbx new file mode 100644 index 0000000..5ef8c8f Binary files /dev/null and b/Database - SteamDeck.kdbx differ diff --git a/Database - desktop.kdbx b/Database - desktop.kdbx index dc66c02..945efd4 100644 Binary files a/Database - desktop.kdbx and b/Database - desktop.kdbx differ diff --git a/Database - global.kdbx b/Database - global.kdbx index c4659db..c91c625 100644 Binary files a/Database - global.kdbx and b/Database - global.kdbx differ diff --git a/Database - laptop.kdbx b/Database - laptop.kdbx deleted file mode 100644 index b0e063b..0000000 Binary files a/Database - laptop.kdbx and /dev/null differ diff --git a/Database - laptop_linux.kdbx b/Database - laptop_linux.kdbx deleted file mode 100644 index 5515083..0000000 Binary files a/Database - laptop_linux.kdbx and /dev/null differ diff --git a/Database - linux.kdbx b/Database - linux.kdbx deleted file mode 100644 index 5e431ab..0000000 Binary files a/Database - linux.kdbx and /dev/null differ diff --git a/Database - tmp.kdbx b/Database - tmp.kdbx deleted file mode 100644 index bbd6465..0000000 Binary files a/Database - tmp.kdbx and /dev/null differ diff --git a/KeeShare.kdbx.share b/KeeShare.kdbx.share index df755b4..2077d5d 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 index 04e64c8..63957d5 100755 --- a/merge_all_databases.sh +++ b/merge_all_databases.sh @@ -16,7 +16,6 @@ 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 @@ -26,7 +25,6 @@ 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