Commit adb9d03

authored

Merge branch 'master' into add/input-override

2 parents 45d18e8 + 9e85ff9 commit adb9d03Copy full SHA for adb9d03

File tree

-6

lines changed

lib/bashly
- libraries/strings
  - strings.yml
- views/wrapper
  - bash3_bouncer.gtx
spec/approvals
- bash
  - error
- script/wrapper
  - code

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,6 @@ examples_caption_on_error: 'examples:'`
`40`	`40`	`disallowed_flag: "%{name} must be one of: %{allowed}"`
`41`	`41`	`disallowed_argument: "%{name} must be one of: %{allowed}"`
`42`	`42`	`disallowed_environment_variable: "%{name} environment variable must be one of: %{allowed}"`
`43`		`-unsupported_bash_version: "bash version 4 or higher is required"`
	`43`	`+unsupported_bash_version: "bash version 4.2 or higher is required"`
`44`	`44`	`validation_error: "validation error in %s:\\n%s"`
`45`	`45`	`environment_variable_validation_error: "validation error in environment variable %s:\\n%s"`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,10 @@`
`1`	`1`	`= view_marker`
`2`	`2`
`3`		`-> if [[ "${BASH_VERSINFO:-0}" -lt 4 ]]; then`
	`3`	`+> if ((BASH_VERSINFO[0] < 4 \|\| (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] < 2))); then`
`4`	`4`	`> printf "{{ strings[:unsupported_bash_version] }}\n" >&2`
`5`	`5`	`> exit 1`
`6`	`6`	`> fi`
`7`		`->`
	`7`	`+>`
	`8`	`+`
	`9`	`+`
	`10`	`+`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-bash version 4 or higher is required`
	`1`	`+bash version 4.2 or higher is required`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`# Modifying it manually is not recommended`
`4`	`4`
`5`	`5`	`# :wrapper.bash3_bouncer`
`6`		`-if [[ "${BASH_VERSINFO:-0}"-lt 4 ]]; then`
`7`		`- printf "bash version 4 or higher is required\n" >&2`
	`6`	`+if ((BASH_VERSINFO[0] <4\|\| (BASH_VERSINFO[0] == 4 && BASH_VERSINFO[1] <2))); then`
	`7`	`+ printf "bash version 4.2 or higher is required\n" >&2`
`8`	`8`	`exit 1`
`9`	`9`	`fi`
`10`	`10`

Comments

(0)