add a function edit_pass to facilitate the utilisation of edit_new_pass option parameter and correct when it's unused

modifié :         rofi-pass

1 files changed, 10 insertions, 7 deletions

diff --git a/rofi-pass b/rofi-pass
index 22667e2..646ec39 100755
--- a/rofi-pass
+++ b/rofi-pass
@@ -683,6 +683,12 @@ manageEntry () {
 	fi
 }
 
+edit_pass() {
+    if [[ $edit_new_pass == "true" ]]; then
+        PASSWORD_STORE_DIR="${root}" pass edit "${1}"
+    fi
+}
+
 insertPass () {
 	url=$(xclip --selection clipboard -o)
 
@@ -744,13 +750,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
@@ -759,16 +765,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
 }