Skip to content

Commit 3275999

Browse files
authored
[bash] Fix issue where paste command doesn't work on Mac (#21986)
1 parent 5bdb691 commit 3275999

File tree

2 files changed

+183
-183
lines changed

2 files changed

+183
-183
lines changed

modules/openapi-generator/src/main/resources/bash/client.mustache

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -674,7 +674,7 @@ read -r -d '' appdescription <<EOF
674674
{{#x-bash-codegen-app-description}}{{{x-bash-codegen-app-description}}}{{/x-bash-codegen-app-description}}
675675
{{^x-bash-codegen-app-description}}{{{appDescription}}}{{/x-bash-codegen-app-description}}
676676
EOF
677-
echo "$appdescription" | paste -sd' ' | fold -sw 80
677+
echo "$appdescription" | paste -sd' ' - | fold -sw 80
678678
}
679679

680680

@@ -700,23 +700,23 @@ print_version() {
700700
##############################################################################
701701
print_{{operationId}}_help() {
702702
echo ""
703-
echo -e "${BOLD}${WHITE}{{operationId}} - {{{summary}}}{{#authMethods}}${OFF}${BLUE}(AUTH - {{#isBasicBasic}}BASIC{{/isBasicBasic}}{{#isApiKey}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{/isApiKey}}{{#isOAuth}}OAuth2{{/isOAuth}}){{/authMethods}}${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
703+
echo -e "${BOLD}${WHITE}{{operationId}} - {{{summary}}}{{#authMethods}}${OFF}${BLUE}(AUTH - {{#isBasicBasic}}BASIC{{/isBasicBasic}}{{#isApiKey}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{/isApiKey}}{{#isOAuth}}OAuth2{{/isOAuth}}){{/authMethods}}${OFF}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
704704
echo -e ""
705705
{{#vendorExtensions}}
706706
{{#x-bash-codegen-description}}
707-
echo -e "{{{x-bash-codegen-description}}}" | paste -sd' ' | fold -sw 80
707+
echo -e "{{{x-bash-codegen-description}}}" | paste -sd' ' - | fold -sw 80
708708
echo -e ""
709709
{{/x-bash-codegen-description}}
710710
{{^x-bash-codegen-description}}
711711
{{#notes}}
712-
echo -e "{{{.}}}" | paste -sd' ' | fold -sw 80
712+
echo -e "{{{.}}}" | paste -sd' ' - | fold -sw 80
713713
echo -e ""
714714
{{/notes}}
715715
{{/x-bash-codegen-description}}
716716
{{/vendorExtensions}}
717717
{{^vendorExtensions}}
718718
{{#notes}}
719-
echo -e "{{{.}}}" | paste -sd' ' | fold -sw 80
719+
echo -e "{{{.}}}" | paste -sd' ' - | fold -sw 80
720720
echo -e ""
721721
{{/notes}}
722722
{{/vendorExtensions}}
@@ -725,24 +725,24 @@ print_{{operationId}}_help() {
725725
{{/hasParams}}
726726
{{#allParams}}
727727
{{#isPathParam}}
728-
echo -e " * ${GREEN}{{baseName}}${OFF} ${BLUE}[{{dataType}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}{{#defaultValue}} ${CYAN}(default: {{defaultValue}}){{/defaultValue}}${OFF} - {{{description}}} ${YELLOW}Specify as: {{baseName}}=value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
728+
echo -e " * ${GREEN}{{baseName}}${OFF} ${BLUE}[{{dataType}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}{{#defaultValue}} ${CYAN}(default: {{defaultValue}}){{/defaultValue}}${OFF} - {{{description}}} ${YELLOW}Specify as: {{baseName}}=value${OFF}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
729729
{{/isPathParam}}
730730
{{#isQueryParam}}
731731
echo -e " * ${GREEN}{{baseName}}${OFF} ${BLUE}[{{dataType}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}{{#defaultValue}} ${CYAN}(default: {{defaultValue}}){{/defaultValue}}${OFF} - {{{description}}}${YELLOW}{{#isContainer}} Specify as: {{#vendorExtensions}}{{#x-codegen-collection-multi}}{{baseName}}=value1 {{baseName}}=value2 {{baseName}}=...{{/x-codegen-collection-multi}}{{#x-codegen-collection-csv}}{{baseName}}="value1,value2,..."{{/x-codegen-collection-csv}}{{#x-codegen-collection-pipes}}{{baseName}}="value1|value2|..."{{/x-codegen-collection-pipes}}{{#x-codegen-collection-ssv}}{{baseName}}="value1 value2 ..."{{/x-codegen-collection-ssv}}{{#x-codegen-collection-tsv}}{{baseName}}="value1\\tvalue2\\t..."{{/x-codegen-collection-tsv}}{{/vendorExtensions}}{{/isContainer}}{{^isContainer}} Specify as: {{baseName}}=value{{/isContainer}}${OFF}" \
732-
| paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
732+
| paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
733733
{{/isQueryParam}}
734734
{{#isHeaderParam}}
735-
echo -e " * ${GREEN}{{baseName}}${OFF} ${BLUE}[{{dataType}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}{{#defaultValue}} ${CYAN}(default: {{defaultValue}}){{/defaultValue}}${OFF} - {{{description}}} ${YELLOW}Specify as: {{baseName}}:value${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
735+
echo -e " * ${GREEN}{{baseName}}${OFF} ${BLUE}[{{dataType}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}{{#defaultValue}} ${CYAN}(default: {{defaultValue}}){{/defaultValue}}${OFF} - {{{description}}} ${YELLOW}Specify as: {{baseName}}:value${OFF}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
736736
{{/isHeaderParam}}
737737
{{/allParams}}
738738
{{#allParams}}
739739
{{#isBodyParam}}
740-
echo -e " * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{{mediaType}}}{{^-last}},{{/-last}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
740+
echo -e " * ${GREEN}body${OFF} ${BLUE}[{{#consumes}}{{{mediaType}}}{{^-last}},{{/-last}}{{/consumes}}]${OFF}{{#required}} ${RED}(required)${OFF}{{/required}}${OFF} - {{{description}}}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
741741
echo -e ""
742742
{{#vendorExtensions}}
743743
{{#x-codegen-body-example}}
744744
echo -e "${BOLD}${WHITE}Body content example${OFF}"
745-
echo -e '{{{x-codegen-body-example}}}' | paste -sd' ' | fold -sw 80
745+
echo -e '{{{x-codegen-body-example}}}' | paste -sd' ' - | fold -sw 80
746746
echo -e ""
747747
{{/x-codegen-body-example}}
748748
{{/vendorExtensions}}
@@ -752,14 +752,14 @@ print_{{operationId}}_help() {
752752
echo -e "${BOLD}${WHITE}Responses${OFF}"
753753
{{#responses}}
754754
code={{code}}
755-
echo -e "${result_color_table[${code:0:1}]} {{code}};{{{message}}}${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/ /'
755+
echo -e "${result_color_table[${code:0:1}]} {{code}};{{{message}}}${OFF}" | paste -sd' ' - | column -t -s ';' | fold -sw 80 | sed '2,$s/^/ /'
756756
{{#headers}}
757757
{{#-first}}
758758
echo -e " ${BOLD}${WHITE}Response headers${OFF}"
759759
{{/-first}}
760760
{{/headers}}
761761
{{#headers}}
762-
echo -e " ${BLUE}{{baseName}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
762+
echo -e " ${BLUE}{{baseName}}${OFF} - {{{description}}}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
763763
{{/headers}}
764764
{{/responses}}
765765
{{#vendorExtensions}}

0 commit comments

Comments
 (0)