The 2.10.0 release.

matejak · Sep 22, 2020 · 55b42b2 · 55b42b2
1 parent 530f5e2
commit 55b42b2
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 21 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
-2.9.1 (TBA)
-------------------
+2.10.1 (TBA)
+-------------------
+
+
+2.10.0 (2020-09-22)
+-------------------
 
 Buxfixes:
 
@@ -9,7 +13,7 @@ Buxfixes:
 New features:
 
 * Argbash in the container has no longer the terminal output limitation caused by the crlf line ending (#129). Thanks to Felipe Santos (@felipecrs)!.
-* The ARG_USE_PROG implementation was missing. Therefore, it was implemented as ARG_USE_PROGRAM using a slightly different interface.
+* The `ARG_USE_PROG` implementation was missing. Therefore, it was implemented as `ARG_USE_PROGRAM` using a slightly different interface.
 
 
 2.9.0 (2020-08-01)

diff --git a/bin/argbash b/bin/argbash
@@ -24,7 +24,7 @@
 
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 
@@ -201,11 +201,11 @@ parse_commandline()
 				exit 0
 				;;
 			-v|--version)
-				printf '%s %s\n\n%s\n' "argbash" "2.9.0" 'Argbash is an argument parser generator for Bash.'
+				printf '%s %s\n\n%s\n' "argbash" "2.10.0" 'Argbash is an argument parser generator for Bash.'
 				exit 0
 				;;
 			-v*)
-				printf '%s %s\n\n%s\n' "argbash" "2.9.0" 'Argbash is an argument parser generator for Bash.'
+				printf '%s %s\n\n%s\n' "argbash" "2.10.0" 'Argbash is an argument parser generator for Bash.'
 				exit 0
 				;;
 			*)

diff --git a/bin/argbash-1to2 b/bin/argbash-1to2
@@ -3,15 +3,15 @@
 # shellcheck disable=SC2016
 # SC2016: Expressions don't expand in single quotes, use double quotes for that.
 
-version=2.9.0
+version=2.10.0
 # ARG_POSITIONAL_INF([input],[The input file to transform],[1])
 # ARG_OPTIONAL_SINGLE([output],[o],[Name of the output file (pass '-' for stdout and empty string for the same as input file)],[""])
 # ARG_VERSION([echo "argbash-1to2 v$version"])
 # ARG_HELP([Convert a template for argbash>=1,<2 to argbash>=2,<3])
 
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 

diff --git a/bin/argbash-init b/bin/argbash-init
@@ -4,7 +4,7 @@
 # SC2001: See if you can use ${variable//search/replace} instead.
 # SC2016: Expressions don't expand in single quotes, use double quotes for that.
 
-version=2.9.0
+version=2.10.0
 # ARG_POSITIONAL_SINGLE([output],[Name of the output template],[-])
 # ARG_OPTIONAL_INCREMENTAL([separate],[s],[Separate the parsing logic (specify two times for complete separation)])
 # ARG_OPTIONAL_BOOLEAN([hints],[],[Whether to write hints to the script template])
@@ -19,7 +19,7 @@ version=2.9.0
 
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 
@@ -401,6 +401,8 @@ do_stuff()
 }
 
 outfname="$_arg_output"
+# we canonicize the empty string input to output filename to the dash
+test -n "$outfname" || outfname='-'
 test "$outfname" = "-" -a "$_arg_separate" -gt 0 && die "If you want to separate parsing and script body, you have to specify the outname, stdout doesn't work."
 
 if test "$outfname" = '-'

diff --git a/doc/_static/argbash-version.txt b/doc/_static/argbash-version.txt
@@ -1,3 +1,3 @@
-argbash 2.9.0
+argbash 2.10.0
 
 Argbash is an argument parser generator for Bash.
diff --git a/doc/_static/wrapper-output-action.txt b/doc/_static/wrapper-output-action.txt
@@ -12,7 +12,7 @@ Contents of '../src' matching '*.m4':
 	docopt.m4: 3 kiB
 	env_vars.m4: 1 kiB
 	function_generators.m4: 7 kiB
-	list.m4: 5 kiB
+	list.m4: 6 kiB
 	output-bash-script.m4: 1 kiB
 	output-completion.m4: 4 kiB
 	output-docopt.m4: 0 kiB

diff --git a/resources/Makefile b/resources/Makefile
@@ -209,7 +209,6 @@ version:
 release: version $(GENPARSE) $(ARGBASH_TO) examples check
 	sed -i "1s/([-0-9]+)/($$(date -I))/" $(CHANGELOG)
 	cd ../doc && $(MAKE) clean && $(MAKE) html && $(MAKE) clean-tmp
-	$(MAKE) ../docker/Dockerfile
 
 tag:
 	git tag $(shell cat ../src/version) -s -m 'Version release' master

diff --git a/resources/examples/minimal-raw.m4 b/resources/examples/minimal-raw.m4
@@ -2,7 +2,7 @@
 
 # m4_ignore(
 echo "This is just a script template, not the script (yet) - pass it to 'argbash' to fix this." >&2
-exit 11  #)Created by argbash-init v2.9.0
+exit 11  #)Created by argbash-init v2.10.0
 # ARG_OPTIONAL_SINGLE([option])
 # ARG_OPTIONAL_BOOLEAN([print])
 # ARG_POSITIONAL_SINGLE([positional-arg])

diff --git a/resources/examples/minimal.m4 b/resources/examples/minimal.m4
@@ -2,7 +2,7 @@
 
 # m4_ignore(
 echo "This is just a script template, not the script (yet) - pass it to 'argbash' to fix this." >&2
-exit 11  #)Created by argbash-init v2.9.0
+exit 11  #)Created by argbash-init v2.10.0
 # ARG_OPTIONAL_SINGLE([option], o, [A option with short and long flags and default], [boo])
 # ARG_OPTIONAL_BOOLEAN([print], , [A boolean option with long flag (and implicit default: off)])
 # ARG_POSITIONAL_SINGLE([positional-arg], [Positional arg description], )

diff --git a/resources/examples/simple-parsing.sh b/resources/examples/simple-parsing.sh
@@ -8,7 +8,7 @@
 # ARGBASH_SET_INDENT([  ])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 

diff --git a/resources/examples/simple-wrapper.sh b/resources/examples/simple-wrapper.sh
@@ -8,7 +8,7 @@
 # ARGBASH_SET_INDENT([  ])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 
@@ -134,7 +134,7 @@ assign_positional_args 1 "${_positionals[@]}"
 
 # OTHER STUFF GENERATED BY Argbash
 _args_simple_parsing=("${_args_simple_parsing_opt[@]}" "${_args_simple_parsing_pos[@]}")
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || die "Couldn't determine the script's running directory, which probably matters, bailing out" 2
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || { echo "Couldn't determine the script's running directory, which probably matters, bailing out" >&2; exit 2; }
 
 ### END OF CODE GENERATED BY Argbash (sortof) ### ])
 # [ <-- needed because of Argbash

diff --git a/resources/examples/simple.sh b/resources/examples/simple.sh
@@ -4,12 +4,12 @@
 # INCLUDE_PARSING_CODE([simple-parsing.sh])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
+### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, see https://argbash.io for more info
 
 # OTHER STUFF GENERATED BY Argbash
-script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || die "Couldn't determine the script's running directory, which probably matters, bailing out" 2
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" || { echo "Couldn't determine the script's running directory, which probably matters, bailing out" >&2; exit 2; }
 . "$script_dir/simple-parsing.sh"  # '.' means 'source'
 
 

diff --git a/src/version b/src/version
@@ -1 +1 @@
-2.9.0
+2.10.0