Merge pull request #195 from matejak/various

Fix various minor issues

Author: matejak

AUTHORS

@@ -3,4 +3,5 @@ Conduitry <[email protected]>
 Felipe Santos
 Kevin Stravers <[email protected]>
 Matěj Týč <[email protected]>
+Nicola Lunghi <[email protected]>
 Stephen Gallagher <[email protected]>

bin/argbash

@@ -107,6 +107,7 @@ print_help()
 parse_commandline()
 {
 	_positionals_count=0
+	local _key
 	while test $# -gt 0
 	do
 		_key="$1"

bin/argbash-1to2

@@ -53,6 +53,7 @@ print_help()
 parse_commandline()
 {
 	_positionals_count=0
+	local _key
 	while test $# -gt 0
 	do
 		_key="$1"

bin/argbash-init

@@ -85,6 +85,7 @@ print_help()
 parse_commandline()
 {
 	_positionals_count=0
+	local _key
 	while test $# -gt 0
 	do
 		_key="$1"

src/function_generators.m4

@@ -67,8 +67,8 @@ m4_define([_MAKE_RESTRICT_VALUES_FUNCTION], [MAKE_FUNCTION(
 		_INDENT_()[@S|@2: The passed value]],
 	[evaluate_strictness],
 	[_INDENT_()_CASE_RESTRICT_VALUES([],
-		[@<:@@<:@ "@S|@2" =~ ^-(-(m4_list_join([_ARGS_LONG], [|]))$|m4_dquote(m4_list_join([_ARGS_SHORT], []))) @:>@@:>@ && die "You have passed '@S|@2' as a value of argument '@S|@1', which makes it look like that you have omitted the actual value, since '@S|@2' is an option accepted by this script. This is considered a fatal error."],
-		[@<:@@<:@ "@S|@2" =~ ^--?@<:@a-zA-Z@:>@ @:>@@:>@ && die "You have passed '@S|@2' as a value of argument '@S|@1'. It looks like that you are trying to pass an option instead of the actual value, which is considered a fatal error."])_ENDL_()],
+		[! @<:@@<:@ "@S|@2" =~ ^-(-(m4_list_join([_ARGS_LONG], [|]))$|m4_dquote(m4_list_join([_ARGS_SHORT], []))) @:>@@:>@ || die "You have passed '@S|@2' as a value of argument '@S|@1', which makes it look like that you have omitted the actual value, since '@S|@2' is an option accepted by this script. This is considered a fatal error."],
+		[! @<:@@<:@ "@S|@2" =~ ^--?@<:@a-zA-Z@:>@ @:>@@:>@ || die "You have passed '@S|@2' as a value of argument '@S|@1'. It looks like that you are trying to pass an option instead of the actual value, which is considered a fatal error."])_ENDL_()],
 )])
 
 
@@ -168,6 +168,7 @@ m4_define([_MAKE_ARGV_PARSING_FUNCTION], [MAKE_FUNCTION(
 	[parse_commandline], [m4_do(
 		[_JOIN_INDENTED(1,
 			_IF_HAVE_POSITIONAL_ARGS([[_positionals_count=0],]),
+			m4_if(m4_expand([_OUTPUT_TYPE]), [bash-script], [[local _key]]),
 			[while test $[]# -gt 0],
 			[do],
 		)],

tests/regressiontests/Makefile

@@ -255,12 +255,15 @@ stability: $(TESTDIR)/basic.sh $(TESTDIR)/basic2.sh
 basic: $(TESTDIR)/basic.sh
 	$(generic_regression_posix)
 	$(generic_regression_gnu_only)
+	grep -q "local _key$$" $<
 	$< -h | grep -q 'P percent: %'
 	$< -h | grep -q 'O percent: %'
 	! $< -h | grep -qe '\[--\]'
 	test -z "$(SHELLCHECK)" || $(SHELLCHECK) "$(TESTDIR)/basic.sh"
 basic-dash: $(TESTDIR)/basic-dash.sh
 	$(generic_regression_posix)
+	! grep -q "local _key$$" $<
+	$< LOO -b | grep -q BOOL=off,
 	$< LOO -b | grep -q BOOL=off,
 	$< -h | grep -q 'P percent: %'
 	$< -h | grep -q 'O percent: %'
@@ -748,9 +751,9 @@ gen-test-group-wrong: $(TESTDIR)/gen-test-group-wrong.m4 $(ARGBASH_BIN)
 	ERROR="'foo' is not a script argument" $(REVERSE) $(ARGBASH_EXEC) $< > /dev/null
 
 $(TESTDIR)/test-semi_strict.sh: $(TESTDIR)/test-simple.m4 $(ARGBASH_BIN)
-	printf "%s\n%s\n" "#!/usr/bin/env bash" "# ARG_RESTRICT_VALUES([no-local-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -
+	printf "%s\n%s\n" "#!/usr/bin/env bash" "set -e" "# ARG_RESTRICT_VALUES([no-local-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -
 $(TESTDIR)/test-very_strict.sh: $(TESTDIR)/test-simple.m4 $(ARGBASH_BIN)
-	printf "%s\n%s\n" "#!/usr/bin/env bash" "# ARG_RESTRICT_VALUES([no-any-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -
+	printf "%s\n%s\n" "#!/usr/bin/env bash" "set -e" "# ARG_RESTRICT_VALUES([no-any-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -
 test-semi_strict: $(TESTDIR)/test-semi_strict.sh
 	$< -o -x pos-arg | grep -q 'OPT_S=-x,'
 	$< -o --opt-argx pos-arg | grep -q 'OPT_S=--opt-argx,'

tests/regressiontests/make/tests/tests-base.m4

@@ -6,6 +6,7 @@ ADD_TEST_BASH([stability], [[
 ADD_TEST_BASH([basic], [[
 	$(generic_regression_posix)
 	$(generic_regression_gnu_only)
+	grep -q "local _key$$" $<
 	$< -h | grep -q 'P percent: %'
 	$< -h | grep -q 'O percent: %'
 	! $< -h | grep -qe '\[--\]'
@@ -14,6 +15,8 @@ ADD_TEST_BASH([basic], [[
 
 ADD_TEST_DASH([basic], [[
 	$(generic_regression_posix)
+	! grep -q "local _key$$" $<
+	$< LOO -b | grep -q BOOL=off,
 	$< LOO -b | grep -q BOOL=off,
 	$< -h | grep -q 'P percent: %'
 	$< -h | grep -q 'O percent: %'

tests/regressiontests/make/tests/tests-strict.m4

@@ -1,8 +1,8 @@
 ADD_RULE([$(TESTDIR)/test-semi_strict.sh], [$(TESTDIR)/test-simple.m4 $(ARGBASH_BIN)],
-	[[printf "%s\n%s\n" "#!/usr/bin/env bash" "# ARG_RESTRICT_VALUES([no-local-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -]])
+	[[printf "%s\n%s\n" "#!/usr/bin/env bash" "set -e" "# ARG_RESTRICT_VALUES([no-local-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -]])
 
 ADD_RULE([$(TESTDIR)/test-very_strict.sh], [$(TESTDIR)/test-simple.m4 $(ARGBASH_BIN)],
-	[[printf "%s\n%s\n" "#!/usr/bin/env bash" "# ARG_RESTRICT_VALUES([no-any-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -]])
+	[[printf "%s\n%s\n" "#!/usr/bin/env bash" "set -e" "# ARG_RESTRICT_VALUES([no-any-options])" | cat - $< | $(ARGBASH_BIN) -o $(@) -]])
 
 
 dnl We have to pass a positional argument, so sometimes we pass 'pos-arg', sometimes stuff that looks like a option