Skip to content

Commit 8ecc43b

Browse files
committed
[bash] Fix issue where paste command doesn't work on Mac
1 parent c3970d7 commit 8ecc43b

3 files changed

Lines changed: 341 additions & 341 deletions

File tree

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ read -r -d '' appdescription <<EOF
667667
{{#x-bash-codegen-app-description}}{{{x-bash-codegen-app-description}}}{{/x-bash-codegen-app-description}}
668668
{{^x-bash-codegen-app-description}}{{{appDescription}}}{{/x-bash-codegen-app-description}}
669669
EOF
670-
echo "$appdescription" | paste -sd' ' | fold -sw 80
670+
echo "$appdescription" | paste -sd' ' - | fold -sw 80
671671
}
672672

673673

@@ -693,23 +693,23 @@ print_version() {
693693
##############################################################################
694694
print_{{operationId}}_help() {
695695
echo ""
696-
echo -e "${BOLD}${WHITE}{{operationId}} - {{{summary}}}{{#authMethods}}${OFF}${BLUE}(AUTH - {{#isBasic}}BASIC{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{/isApiKey}}{{#isOAuth}}OAuth2{{/isOAuth}}){{/authMethods}}${OFF}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
696+
echo -e "${BOLD}${WHITE}{{operationId}} - {{{summary}}}{{#authMethods}}${OFF}${BLUE}(AUTH - {{#isBasic}}BASIC{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}}HEADER{{/isKeyInHeader}}{{#isKeyInQuery}}QUERY{{/isKeyInQuery}}{{/isApiKey}}{{#isOAuth}}OAuth2{{/isOAuth}}){{/authMethods}}${OFF}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
697697
echo -e ""
698698
{{#vendorExtensions}}
699699
{{#x-bash-codegen-description}}
700-
echo -e "{{{x-bash-codegen-description}}}" | paste -sd' ' | fold -sw 80
700+
echo -e "{{{x-bash-codegen-description}}}" | paste -sd' ' - | fold -sw 80
701701
echo -e ""
702702
{{/x-bash-codegen-description}}
703703
{{^x-bash-codegen-description}}
704704
{{#notes}}
705-
echo -e "{{{.}}}" | paste -sd' ' | fold -sw 80
705+
echo -e "{{{.}}}" | paste -sd' ' - | fold -sw 80
706706
echo -e ""
707707
{{/notes}}
708708
{{/x-bash-codegen-description}}
709709
{{/vendorExtensions}}
710710
{{^vendorExtensions}}
711711
{{#notes}}
712-
echo -e "{{{.}}}" | paste -sd' ' | fold -sw 80
712+
echo -e "{{{.}}}" | paste -sd' ' - | fold -sw 80
713713
echo -e ""
714714
{{/notes}}
715715
{{/vendorExtensions}}
@@ -718,24 +718,24 @@ print_{{operationId}}_help() {
718718
{{/hasParams}}
719719
{{#allParams}}
720720
{{#isPathParam}}
721-
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/^/ /'
721+
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/^/ /'
722722
{{/isPathParam}}
723723
{{#isQueryParam}}
724724
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}" \
725-
| paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
725+
| paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
726726
{{/isQueryParam}}
727727
{{#isHeaderParam}}
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
{{/isHeaderParam}}
730730
{{/allParams}}
731731
{{#allParams}}
732732
{{#isBodyParam}}
733-
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/^/ /'
733+
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/^/ /'
734734
echo -e ""
735735
{{#vendorExtensions}}
736736
{{#x-codegen-body-example}}
737737
echo -e "${BOLD}${WHITE}Body content example${OFF}"
738-
echo -e '{{{x-codegen-body-example}}}' | paste -sd' ' | fold -sw 80
738+
echo -e '{{{x-codegen-body-example}}}' | paste -sd' ' - | fold -sw 80
739739
echo -e ""
740740
{{/x-codegen-body-example}}
741741
{{/vendorExtensions}}
@@ -745,14 +745,14 @@ print_{{operationId}}_help() {
745745
echo -e "${BOLD}${WHITE}Responses${OFF}"
746746
{{#responses}}
747747
code={{code}}
748-
echo -e "${result_color_table[${code:0:1}]} {{code}};{{{message}}}${OFF}" | paste -sd' ' | column -t -s ';' | fold -sw 80 | sed '2,$s/^/ /'
748+
echo -e "${result_color_table[${code:0:1}]} {{code}};{{{message}}}${OFF}" | paste -sd' ' - | column -t -s ';' | fold -sw 80 | sed '2,$s/^/ /'
749749
{{#headers}}
750750
{{#-first}}
751751
echo -e " ${BOLD}${WHITE}Response headers${OFF}"
752752
{{/-first}}
753753
{{/headers}}
754754
{{#headers}}
755-
echo -e " ${BLUE}{{baseName}}${OFF} - {{{description}}}" | paste -sd' ' | fold -sw 80 | sed '2,$s/^/ /'
755+
echo -e " ${BLUE}{{baseName}}${OFF} - {{{description}}}" | paste -sd' ' - | fold -sw 80 | sed '2,$s/^/ /'
756756
{{/headers}}
757757
{{/responses}}
758758
{{#vendorExtensions}}

0 commit comments

Comments
 (0)