Improved conditionals for arguments count checking (fixes #30).

Restored compatibility of scripts with Bash strict modes.

ChangeLog

@@ -1,3 +1,12 @@
+2.5.1 (TBA)
+------------------
+
+Bugfixes:
+
+* Fixed argbash-init corner cases (wrong output filename, ).
+* Allowed argbash to wrap scripts in files with no extension.
+* Fixed compatibility with the `-e` (i.e. "strict") mode (fixed #30).
+
 2.5.0 (2017-09-03)
 ------------------
 

bin/argbash

@@ -146,8 +146,8 @@ parse_commandline ()
 handle_passed_args_count ()
 {
 	_required_args_string="'input'"
-	test ${#_positionals[@]} -lt 1 && _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require exactly 1 (namely: $_required_args_string), but got only ${#_positionals[@]}." 1
-	test ${#_positionals[@]} -gt 1 && _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect exactly 1 (namely: $_required_args_string), but got ${#_positionals[@]} (the last one was: '${_positionals[*]: -1}')." 1
+	test ${#_positionals[@]} -ge 1 || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require exactly 1 (namely: $_required_args_string), but got only ${#_positionals[@]}." 1
+	test ${#_positionals[@]} -le 1 || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect exactly 1 (namely: $_required_args_string), but got ${#_positionals[@]} (the last one was: '${_positionals[*]: -1}')." 1
 }
 
 assign_positional_args ()

bin/argbash-1to2

@@ -92,7 +92,7 @@ parse_commandline ()
 handle_passed_args_count ()
 {
 	_required_args_string="'input'"
-	test ${#_positionals[@]} -lt 1 && _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require at least 1 (namely: $_required_args_string), but got only ${#_positionals[@]}." 1
+	test ${#_positionals[@]} -ge 1 || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require at least 1 (namely: $_required_args_string), but got only ${#_positionals[@]}." 1
 }
 
 assign_positional_args ()

bin/argbash-init

@@ -168,7 +168,7 @@ parse_commandline ()
 
 handle_passed_args_count ()
 {
-	test ${#_positionals[@]} -gt 1 && _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect between 0 and 1, but got ${#_positionals[@]} (the last one was: '${_positionals[*]: -1}')." 1
+	test ${#_positionals[@]} -le 1 || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect between 0 and 1, but got ${#_positionals[@]} (the last one was: '${_positionals[*]: -1}')." 1
 }
 
 assign_positional_args ()

src/function_generators.m4

@@ -65,9 +65,9 @@ m4_define([_MAKE_RESTRICT_VALUES_FUNCTION], [m4_do(
 m4_define([_CHECK_FOR_TOO_LITTLE_ARGS], [m4_do(
 	[_INDENT_(1)_required_args_string="m4_list_join([_POSITIONALS_REQUIRED], [, ], , , [ and ])"
 ],
-	[_INDENT_(1)[test ${#_positionals[@]} -lt ]],
+	[_INDENT_(1)[test ${#_positionals[@]} -ge ]],
 	[_MINIMAL_POSITIONAL_VALUES_COUNT],
-	[[ && _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require ]],
+	[[ || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require ]],
 	[_SPECIFICATION_OF_ACCEPTED_VALUES_COUNT],
 	[ (namely: $_required_args_string)],
 	[[, but got only ${#_positionals[@]}." 1
@@ -76,8 +76,8 @@ m4_define([_CHECK_FOR_TOO_LITTLE_ARGS], [m4_do(
 
 
 m4_define([_CHECK_FOR_TOO_MANY_ARGS], [m4_do(
-	[_INDENT_(1)[test ${#_positionals[@]} -gt ]_HIGHEST_POSITIONAL_VALUES_COUNT],
-	[[ && _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect ]],
+	[_INDENT_(1)[test ${#_positionals[@]} -le ]_HIGHEST_POSITIONAL_VALUES_COUNT],
+	[[ || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect ]],
 	[_SPECIFICATION_OF_ACCEPTED_VALUES_COUNT],
 	[_IF_SOME_POSITIONAL_VALUES_ARE_EXPECTED([ (namely: $_required_args_string)])],
 	[dnl The last element of _positionals (even) for bash < 4.3 according to http://unix.stackexchange.com/a/198790

tests/regressiontests/test-infinity-mixed.m4

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # ARG_POSITIONAL_INF([pos-arg], [@pos-arg@], 1, first, second, third)
 # ARG_HELP()
 # ARGBASH_GO

tests/regressiontests/test-ls_like.m4

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # ARG_POSITIONAL_SINGLE([arg], [], [foo])
 # ARG_OPTIONAL_SINGLE([width], w, [])

tests/regressiontests/test-simple.m4

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 
 # ARG_POSITIONAL_SINGLE([pos-arg], [help line PEND-\n-PBEGIN])
 # ARG_OPTIONAL_SINGLE([prefix],[o],[help line END-\n-BEGIN line 2END-\\n-2BEGIN],[x])