Merge pull request #204 from tiregram/correct_edit_new_pass

add a function edit_pass to facilitate the utilisation of edit_new_pa…

1 files changed, 10 insertions, 7 deletions

diff --git a/rofi-pass b/rofi-pass
index 08d13fb..7a3011e 100755
--- a/rofi-pass
+++ b/rofi-pass
@@ -700,6 +700,12 @@ manageEntry () {
 	fi
 }
 
+edit_pass() {
+    if [[ $edit_new_pass == "true" ]]; then
+        PASSWORD_STORE_DIR="${root}" pass edit "${1}"
+    fi
+}
+
 insertPass () {
 	url=$(_clip_out_clipboard)
 
@@ -761,13 +767,13 @@ insertPass () {
 				"${USERNAME_field}: ${user}"
 				"${URL_field}: ${url}"
 			)
-			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${name}" > /dev/null && PASSWORD_STORE_DIR="${root}" pass edit "${name}"
+			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${name}" > /dev/null && edit_pass "${name}"
 		else
 			pass_content=("${pw}"
 				"---"
 				"${USERNAME_field}: ${user}"
 			)
-			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${name}" > /dev/null && PASSWORD_STORE_DIR="${root}" pass edit "${name}"
+			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${name}" > /dev/null && edit_pass "${name}"
 		fi
 	else
 		if [[ $url == http* ]]; then
@@ -776,16 +782,13 @@ insertPass () {
 				"${USERNAME_field}: ${user}"
 				"${URL_field}: ${url}"
 			)
-			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${name}" > /dev/null && PASSWORD_STORE_DIR="${root}" pass edit "${group}/${name}"
+			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${name}" > /dev/null && edit_pass "${group}/${name}"
 		else
 			pass_content=("${pw}"
 				"---"
 				"${USERNAME_field}: ${user}"
 			)
-			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${name}" > /dev/null
-			if [[ $edit_new_pass == "true" ]]; then
-				PASSWORD_STORE_DIR="${root}" pass edit "${group}/${name}"
-			fi
+			printf '%s\n' "${pass_content[@]}" | PASSWORD_STORE_DIR="${root}" pass insert -m "${group}/${name}" > /dev/null && edit_pass "${group}/${name}"
 		fi
 	fi
 }