pashage

commit 8fa27c9c253397f75172bed812f01abafd9efb67
parent a3544fdec2a72892fb03523a43a6588758b36dbe
Author: Natasha Kerensikova <natgh@instinctive.eu>
Date:   Sun, 17 Nov 2024 15:36:19 +0000

OVERWRITE multivalue instead of MULTILINE to communicate in-place generation
Diffstat:
M
spec/action_spec.sh
 | 
6
++++--
M
spec/usage_spec.sh
 | 
8
++++----
M
src/pashage.sh
 | 
16
+++++++---------

3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/spec/action_spec.sh b/spec/action_spec.sh
@@ -1196,7 +1196,8 @@ Describe 'Action Functions'
     End
 
     It 'updates the first line of an existing file'
-      MULTILINE=yes
+      MULTILINE=no
+      OVERWRITE=reuse
       mktemp() { %= "$1"; }
       do_decrypt() {
         mocklog do_decrypt "$@"
@@ -1228,7 +1229,8 @@ Describe 'Action Functions'
     End
 
     It 'updates the only line of an existing one-line file'
-      MULTILINE=yes
+      MULTILINE=no
+      OVERWRITE=reuse
       mktemp() { %= "$1"; }
       do_decrypt() {
         mocklog do_decrypt "$@"
diff --git a/spec/usage_spec.sh b/spec/usage_spec.sh
@@ -834,8 +834,8 @@ Describe 'Command-Line Parsing'
         #|$ check_sneaky_path secret
         #|$ do_generate secret 25 [:punct:][:alnum:]
         #|DECISION=default
-        #|MULTILINE=yes
-        #|OVERWRITE=no
+        #|MULTILINE=no
+        #|OVERWRITE=reuse
         #|SELECTED_LINE=1
         #|SHOW=text
       }
@@ -851,8 +851,8 @@ Describe 'Command-Line Parsing'
         #|$ check_sneaky_path secret
         #|$ do_generate secret 25 [:punct:][:alnum:]
         #|DECISION=default
-        #|MULTILINE=yes
-        #|OVERWRITE=no
+        #|MULTILINE=no
+        #|OVERWRITE=reuse
         #|SELECTED_LINE=1
         #|SHOW=text
       }
diff --git a/src/pashage.sh b/src/pashage.sh
@@ -614,8 +614,8 @@ do_encrypt() {
 #   $2: new password length
 #   $3: new password charset
 #   DECISION: when interactive, show-ask-commit instead of commit-show
-#   OVERWRITE: whether to overwrite without confirmation
-#   MULTILINE: whether to re-use existing secret data
+#   OVERWRITE: whether to overwrite with confirmation ("no"), without
+#              confirmation ("yes"), or with existing secret data ("reuse")
 #   SELECTED_LINE: which line to paste or diplay as qr-code
 #   SHOW: how to show the secret
 do_generate() {
@@ -648,7 +648,7 @@ do_generate_commit() {
 	if [ -d "${PREFIX}/$1.age" ]; then
 		die "Cannot replace directory $1.age"
 
-	elif [ -e "${PREFIX}/$1.age" ] && [ "${MULTILINE}" = yes ]; then
+	elif [ -e "${PREFIX}/$1.age" ] && [ "${OVERWRITE}" = reuse ]; then
 		printf '%s\n' "Decrypting previous secret for $1"
 		OLD_SECRET_FULL="$(do_decrypt "${PREFIX}/$1.age")"
 		OLD_SECRET="${OLD_SECRET_FULL#*"${NL}"}"
@@ -1228,18 +1228,18 @@ cmd_generate() {
 			SHOW=clip
 			shift ;;
 		    -f|--force)
-			if [ "${MULTILINE}" = yes ]; then
+			if ! [ "${OVERWRITE}" = no ]; then
 				PARSE_ERROR=yes
 				break
 			fi
 			OVERWRITE=yes
 			shift ;;
 		    -i|--in-place)
-			if [ "${OVERWRITE}" = yes ]; then
+			if ! [ "${OVERWRITE}" = no ]; then
 				PARSE_ERROR=yes
 				break
 			fi
-			MULTILINE=yes
+			OVERWRITE=reuse
 			shift ;;
 		    -n|--no-symbols)
 			CHARSET="${CHARACTER_SET_NO_SYMBOLS}"
@@ -1273,9 +1273,7 @@ cmd_generate() {
 		esac
 	done
 
-	if [ "${PARSE_ERROR}" = yes ] || [ $# -eq 0 ] || [ $# -gt 3 ] \
-	    || [ "${OVERWRITE}-${MULTILINE}" = yes-yes ]
-	then
+	if [ "${PARSE_ERROR}" = yes ] || [ $# -eq 0 ] || [ $# -gt 3 ]; then
 		cmd_usage 'Usage: ' generate >&2
 		exit 1
 	fi