From 07c4b588076403bff7d9aa73bfe2564eabcc7a0b Mon Sep 17 00:00:00 2001 From: meleu Date: Mon, 14 Apr 2025 15:32:23 -0300 Subject: [PATCH 1/2] Prevent running validate_* functions twice --- lib/bashly/views/flag/validations.gtx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/bashly/views/flag/validations.gtx b/lib/bashly/views/flag/validations.gtx index 8f92f26e..43b0628a 100644 --- a/lib/bashly/views/flag/validations.gtx +++ b/lib/bashly/views/flag/validations.gtx @@ -6,16 +6,20 @@ if validate > values='' > eval "values=(${args['{{ long }}']})" > for value in "${values[@]}"; do - > if [[ -n $(validate_{{ validate }} "$value") ]]; then - > printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$(validate_{{ validate }} "$value")" >&2 + > validation_output="$(validate_{{ validate }} "$value")" + > if [[ -n "$validation_output" ]]; then + > printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$validation_output" >&2 > exit 1 > fi > done > fi else - > if [[ -v args['{{ long }}'] && -n $(validate_{{ validate }} "${args['{{ long }}']:-}") ]]; then - > printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$(validate_{{ validate }} "${args['{{ long }}']:-}")" >&2 - > exit 1 + > if [[ -v args['{{ long }}'] ]]; then + > validation_output="$(validate_{{ validate }} "${args['{{ long }}']:-}")" + > if [[ -n "${validation_output}" ]]; then + > printf "{{ strings[:validation_error] }}\n" "{{ usage_string }}" "$validation_output" >&2 + > exit 1 + > fi > fi > end From 0d21c9dcbe9b2bc81650b4c5499a8fb3f166a1c0 Mon Sep 17 00:00:00 2001 From: Danny Ben Shitrit Date: Tue, 15 Apr 2025 07:26:18 +0000 Subject: [PATCH 2/2] spec artifacts --- examples/render-mandoc/README.md | 2 +- examples/render-mandoc/docs/download.1 | 2 +- examples/render-mandoc/docs/download.md | 2 +- spec/approvals/examples/render-mandoc | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/render-mandoc/README.md b/examples/render-mandoc/README.md index a414d90b..4fed4809 100644 --- a/examples/render-mandoc/README.md +++ b/examples/render-mandoc/README.md @@ -102,7 +102,7 @@ ISSUE TRACKER AUTHORS Lana Lang. -Version 0.1.0 December 2024 download(1) +Version 0.1.0 April 2025 download(1) ```` diff --git a/examples/render-mandoc/docs/download.1 b/examples/render-mandoc/docs/download.1 index a801fc0d..0a04a10c 100644 --- a/examples/render-mandoc/docs/download.1 +++ b/examples/render-mandoc/docs/download.1 @@ -1,6 +1,6 @@ .\" Automatically generated by Pandoc 3.2 .\" -.TH "download" "1" "March 2025" "Version 0.1.0" "Sample application" +.TH "download" "1" "April 2025" "Version 0.1.0" "Sample application" .SH NAME \f[B]download\f[R] \- Sample application .SH SYNOPSIS diff --git a/examples/render-mandoc/docs/download.md b/examples/render-mandoc/docs/download.md index 9d407154..c100ae82 100644 --- a/examples/render-mandoc/docs/download.md +++ b/examples/render-mandoc/docs/download.md @@ -1,6 +1,6 @@ % download(1) Version 0.1.0 | Sample application % Lana Lang -% March 2025 +% April 2025 NAME ================================================== diff --git a/spec/approvals/examples/render-mandoc b/spec/approvals/examples/render-mandoc index 738664d1..440f9b17 100644 --- a/spec/approvals/examples/render-mandoc +++ b/spec/approvals/examples/render-mandoc @@ -44,4 +44,4 @@ ISSUE TRACKER AUTHORS Lana Lang. -Version 0.1.0 March 2025 download(1) +Version 0.1.0 April 2025 download(1)