commit ff6ff4177e29b22bd5f49c23c9cf6fe725a847d7
parent 3ec57195d04bb94a6d8d341f3b209c6fd676ad42
Author: Natasha Kerensikova <natgh@instinctive.eu>
Date: Mon, 11 Nov 2024 11:45:45 +0000
In-place option for generate command is aligned to pass(age)
Diffstat:
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/spec/pashage_extra_spec.sh b/spec/pashage_extra_spec.sh
@@ -651,7 +651,7 @@ Describe 'Integrated Command Functions'
Set 'pipefail:off'
mock-age() { false; }
tail() { @tail "$@"; }
- When run cmd_generate --inplace stale
+ When run cmd_generate --in-place stale
The status should equal 1
The error should equal \
"Fatal(1): mock-age -d -i ${IDENTITIES_FILE} -- ${PREFIX}/stale.age"
diff --git a/spec/pass_spec.sh b/spec/pass_spec.sh
@@ -1728,7 +1728,7 @@ Describe 'Pass-like command'
It 'displays usage when called with incompatible overwriting options'
Skip if 'pass(age) needs bash' check_skip $2
- When run script $1 generate --force --inplace new-secret
+ When run script $1 generate --force --in-place new-secret
The status should equal 1
The output should be blank
The error should include 'Usage:'
@@ -1739,7 +1739,7 @@ Describe 'Pass-like command'
It 'displays usage when called with reversed incompatible overwriting opt'
Skip if 'pass(age) needs bash' check_skip $2
- When run script $1 generate --inplace --force new-secret
+ When run script $1 generate --in-place --force new-secret
The status should equal 1
The output should be blank
The error should include 'Usage:'
diff --git a/spec/usage_spec.sh b/spec/usage_spec.sh
@@ -811,7 +811,7 @@ Describe 'Command-Line Parsing'
#|SELECTED_LINE=1
#|SHOW=text
}
- When call cmd_generate --inplace secret
+ When call cmd_generate --in-place secret
The status should be success
The output should be blank
The error should equal "$(result)"
@@ -867,7 +867,7 @@ Describe 'Command-Line Parsing'
It 'reports incompatible generation long options'
cat() { @cat; }
- When run cmd_generate --inplace --force secret
+ When run cmd_generate --in-place --force secret
The output should be blank
The error should equal "$(usage_text)"
The status should equal 1
diff --git a/src/pashage.sh b/src/pashage.sh
@@ -1207,7 +1207,7 @@ cmd_generate() {
fi
DECISION=force
shift ;;
- -i|--inplace)
+ -i|--in-place)
if [ "${DECISION}" = force ]; then
PARSE_ERROR=yes
break