From 551e36bb849a6e6cd0f71294a97a886493183439 Mon Sep 17 00:00:00 2001 From: q3aql Date: Fri, 1 Jul 2022 19:06:40 +0200 Subject: [PATCH] Check if exists entry with creating new entry section --- pwsh-vault-cli.sh | 27 +++++++++++++++++++++++++++ pwsh-vault-dl.sh | 15 +++++++++++++++ pwsh-vault.sh | 12 ++++++++++++ 3 files changed, 54 insertions(+) diff --git a/pwsh-vault-cli.sh b/pwsh-vault-cli.sh index 484e68b..a05cf59 100755 --- a/pwsh-vault-cli.sh +++ b/pwsh-vault-cli.sh @@ -219,6 +219,15 @@ function create_login_vault_entry() { echo -n "# Enter Name for Login Entry: " ; read name_entry if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/logins/${name_entry}" ] ; then + echo "" + echo "# Vault logins/${name_entry} already exists" + echo "# You can remove or edit it" + echo "" + echo -n "# Press enter key to continue " ; read enter_continue + new_entry="" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/logins/${name_entry}" name_login_entry=1 fi @@ -306,6 +315,15 @@ function create_bcard_vault_entry() { echo -n "# Enter Name for Bcard Entry: " ; read name_entry if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/bcard/${name_entry}" ] ; then + echo "" + echo "# Vault bcard/${name_entry} already exists" + echo "# You can remove or edit it." + echo "" + echo -n "# Press enter key to continue " ; read enter_continue + new_entry="" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/bcard/${name_entry}" name_bcard_entry=1 fi @@ -387,6 +405,15 @@ function create_note_vault_entry() { echo -n "# Enter Name for Note Entry: " ; read name_entry if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/notes/${name_entry}" ] ; then + echo "" + echo "# Vault notes/${name_entry} already exists" + echo "# You can remove or edit it." + echo "" + echo -n "# Press enter key to continue " ; read enter_continue + new_entry="" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/notes/${name_entry}" name_note_entry=1 fi diff --git a/pwsh-vault-dl.sh b/pwsh-vault-dl.sh index d0c293e..5941f9b 100755 --- a/pwsh-vault-dl.sh +++ b/pwsh-vault-dl.sh @@ -254,6 +254,11 @@ function create_login_vault_entry() { name_entry=$(dialog --stdout --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" --inputbox "# Enter Name for Login Entry:" 0 0) if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/logins/${name_entry}" ] ; then + dialog --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" \ + --msgbox "# Vault logins/${name_entry} already exists\n# You can remove or edit it." 0 0 + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/logins/${name_entry}" name_login_entry=1 fi @@ -337,6 +342,11 @@ function create_bcard_vault_entry() { name_entry=$(dialog --stdout --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" --inputbox "# Enter Name for Bcard Entry:" 0 0) if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/bcard/${name_entry}" ] ; then + dialog --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" \ + --msgbox "# Vault bcard/${name_entry} already exists\n# You can remove or edit it." 0 0 + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/bcard/${name_entry}" name_bcard_entry=1 fi @@ -412,6 +422,11 @@ function create_note_vault_entry() { name_entry=$(dialog --stdout --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" --inputbox "# Enter Name for Note Entry:" 0 0) if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/notes/${name_entry}" ] ; then + dialog --title "# pwsh-vault-dl ${VERSION} $(generate_spaces 20)" \ + --msgbox "# Vault notes/${name_entry} already exists\n# You can remove or edit it." 0 0 + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/notes/${name_entry}" name_note_entry=1 fi diff --git a/pwsh-vault.sh b/pwsh-vault.sh index 1a51f93..879ea3d 100755 --- a/pwsh-vault.sh +++ b/pwsh-vault.sh @@ -282,6 +282,10 @@ function create_login_vault_entry() { name_entry=$(echo > /dev/null | pwsh-vaultm -p "爵 Enter Name for Login Entry:") if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/logins/${name_entry}" ] ; then + echo > /dev/null | pwsh-vaultm -p "爵 Vault logins/${name_entry} already exists $(generate_spaces 55)" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/logins/${name_entry}" name_login_entry=1 fi @@ -352,6 +356,10 @@ function create_bcard_vault_entry() { name_entry=$(echo > /dev/null | pwsh-vaultm -p " Enter Name for Bcard Entry:") if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/bcard/${name_entry}" ] ; then + echo > /dev/null | pwsh-vaultm -p " Vault bcard/${name_entry} already exists $(generate_spaces 55)" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/bcard/${name_entry}" name_bcard_entry=1 fi @@ -415,6 +423,10 @@ function create_note_vault_entry() { name_entry=$(echo > /dev/null | pwsh-vaultm -p " Enter Name for Note Entry:") if [ ! -z "${name_entry}" ] ; then name_entry=$(removeSpaces "${name_entry}") + if [ -d "${pwsh_vault}/notes/${name_entry}" ] ; then + echo > /dev/null | pwsh-vaultm -p " Vault notes/${name_entry} already exists $(generate_spaces 55)" + pwsh_vault_main + fi mkdir -p "${pwsh_vault}/notes/${name_entry}" name_note_entry=1 fi