Skip to content

Commit 7f752ed

Browse files
committed
Release 2.11.0
1 parent 77b540d commit 7f752ed

File tree

13 files changed

+29
-18
lines changed

13 files changed

+29
-18
lines changed

ChangeLog

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1-
2.11.0 (2024-05-??)
1+
2.11.0 (2025-05-23)
22
-------------------
33

44
Buxfixes:
55

66
* `#!/bin/bash` is no longer the shebang. The more portable `#!/usr/bin/env bash` is used instead (#185).
77
* Indentation is consistent in validation functions (#143)
88
* Fixed bug preventing short options to have capital letters (#199)
9+
* Scripts with strict argument checking don't abort when executed with errexit (#163)
910

1011
New features:
1112

1213
* The new Argbash macro `ARGBASH_INDICATE_SUPPLIED` allows you to get information on whether an argument has been explicitly passed on the commandline. Big thanks to Kevin Stravers (@kstrafe) for his heroic effort!
1314
* A new `excised` mode that doesn't contain generated code has been introduced (#186)
1415

16+
Incompatible changes (minor):
17+
18+
* Archlinux packaging files were removed, because Argbash has a proper Archlinux package, and the redundant code in the project would require maintenance (#179)
19+
* The `--wrap` argument of `argbash-init` was removed, as it was not working at all, and its added value is negligible (#144)
20+
21+
1522
2.10.0 (2020-09-22)
1623
-------------------
1724

bin/argbash

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
# ARGBASH_GO()
2626
# needed because of Argbash --> m4_ignore([
27-
### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
27+
### START OF CODE GENERATED BY Argbash v2.11.0 one line above ###
2828
# Argbash is a bash code generator used to get arguments parsing right.
2929
# Argbash is FREE SOFTWARE, see https://argbash.dev for more info
3030

@@ -202,11 +202,11 @@ parse_commandline()
202202
exit 0
203203
;;
204204
-v|--version)
205-
printf '%s %s\n\n%s\n' "argbash" "2.10.0" 'Argbash is an argument parser generator for Bash.'
205+
printf '%s %s\n\n%s\n' "argbash" "2.11.0" 'Argbash is an argument parser generator for Bash.'
206206
exit 0
207207
;;
208208
-v*)
209-
printf '%s %s\n\n%s\n' "argbash" "2.10.0" 'Argbash is an argument parser generator for Bash.'
209+
printf '%s %s\n\n%s\n' "argbash" "2.11.0" 'Argbash is an argument parser generator for Bash.'
210210
exit 0
211211
;;
212212
*)

bin/argbash-1to2

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
# shellcheck disable=SC2016
44
# SC2016: Expressions don't expand in single quotes, use double quotes for that.
55

6-
version=2.10.0
6+
version=2.11.0
77
# ARG_POSITIONAL_INF([input],[The input file to transform],[1])
88
# ARG_OPTIONAL_SINGLE([output],[o],[Name of the output file (pass '-' for stdout and empty string for the same as input file)],[""])
99
# ARG_VERSION([echo "argbash-1to2 v$version"])
1010
# ARG_HELP([Convert a template for argbash>=1,<2 to argbash>=2,<3])
1111

1212
# ARGBASH_GO()
1313
# needed because of Argbash --> m4_ignore([
14-
### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
14+
### START OF CODE GENERATED BY Argbash v2.11.0 one line above ###
1515
# Argbash is a bash code generator used to get arguments parsing right.
1616
# Argbash is FREE SOFTWARE, see https://argbash.dev for more info
1717

bin/argbash-init

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# SC2001: See if you can use ${variable//search/replace} instead.
55
# SC2016: Expressions don't expand in single quotes, use double quotes for that.
66

7-
version=2.10.0
7+
version=2.11.0
88
# ARG_POSITIONAL_SINGLE([output],[Name of the output template],[-])
99
# ARG_OPTIONAL_INCREMENTAL([separate],[s],[Separate the parsing logic (specify two times for complete separation)])
1010
# ARG_OPTIONAL_BOOLEAN([hints],[],[Whether to write hints to the script template])
@@ -18,7 +18,7 @@ version=2.10.0
1818

1919
# ARGBASH_GO()
2020
# needed because of Argbash --> m4_ignore([
21-
### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
21+
### START OF CODE GENERATED BY Argbash v2.11.0 one line above ###
2222
# Argbash is a bash code generator used to get arguments parsing right.
2323
# Argbash is FREE SOFTWARE, see https://argbash.dev for more info
2424

doc/_static/argbash-version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
argbash 2.10.0
1+
argbash 2.11.0
22

33
Argbash is an argument parser generator for Bash.

doc/_static/wrapper-output-action.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Contents of '../src' matching '*.m4':
1616
output-bash-script.m4: 1 kiB
1717
output-completion.m4: 4 kiB
1818
output-docopt.m4: 0 kiB
19+
output-excised.m4: 0 kiB
1920
output-manpage-defs.m4: 1 kiB
2021
output-manpage.m4: 1 kiB
2122
output-posix-script.m4: 3 kiB
@@ -24,8 +25,8 @@ Contents of '../src' matching '*.m4':
2425
output-strip-user-content.m4: 0 kiB
2526
progs.m4: 2 kiB
2627
stuff.m4: 47 kiB
27-
utilities.m4: 11 kiB
28-
value_validators.m4: 5 kiB
28+
utilities.m4: 12 kiB
29+
value_validators.m4: 6 kiB
2930
Contents of '../resources/examples' matching '*.m4':
3031
minimal.m4: 0 kiB
3132
minimal-raw.m4: 0 kiB

resources/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,15 @@ altuninstall: define-version uninstall
201201
version: $(MANPAGE)
202202
@test -n '$(VERSION)' || { echo "You have to specify a version string, for example 'make version VERSION=1.0.0'"; exit 1; }
203203
echo '$(VERSION)' > ../src/version
204+
sed -i "s/v[0-9\.]\+$$/v$(VERSION)/" examples/minimal-raw.m4
204205
sed -i "1s/.*/$(VERSION) ($$(date -I))/" $(CHANGELOG)
205206
touch $(M4_SRC)
206207

207208
../docker/Dockerfile: ../docker/Dockerfile.in
208209
cat "$<" | sed -e "s/@VERSION@/$(shell cat ../src/version)/g; s/@NOW@/$(shell date -Iseconds)/" > "$@"
209210

210211
release: version $(GENPARSE) $(ARGBASH_TO) examples check
211-
sed -i "1s/([-0-9]+)/($$(date -I))/" $(CHANGELOG)
212+
sed -i "1s/([-0-9]\+)/($$(date -I))/" $(CHANGELOG)
212213
cd ../doc && $(MAKE) clean && $(MAKE) html && $(MAKE) clean-tmp
213214

214215
tag:

resources/examples/minimal-raw.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# m4_ignore(
44
echo "This is just a script template, not the script (yet) - pass it to 'argbash' to fix this." >&2
5-
exit 11 #)Created by argbash-init v2.10.0
5+
exit 11 #)Created by argbash-init v2.11.0
66
# ARG_OPTIONAL_SINGLE([option])
77
# ARG_OPTIONAL_BOOLEAN([print])
88
# ARG_POSITIONAL_SINGLE([positional-arg])

resources/examples/minimal.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# m4_ignore(
44
echo "This is just a script template, not the script (yet) - pass it to 'argbash' to fix this." >&2
5-
exit 11 #)Created by argbash-init v2.10.0
5+
exit 11 #)Created by argbash-init v2.11.0
66
# ARG_OPTIONAL_SINGLE([option], o, [A option with short and long flags and default], [boo])
77
# ARG_OPTIONAL_BOOLEAN([print], , [A boolean option with long flag (and implicit default: off)])
88
# ARG_POSITIONAL_SINGLE([positional-arg], [Positional arg description], )

resources/examples/simple-parsing.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ARGBASH_SET_INDENT([ ])
99
# ARGBASH_GO()
1010
# needed because of Argbash --> m4_ignore([
11-
### START OF CODE GENERATED BY Argbash v2.10.0 one line above ###
11+
### START OF CODE GENERATED BY Argbash v2.11.0 one line above ###
1212
# Argbash is a bash code generator used to get arguments parsing right.
1313
# Argbash is FREE SOFTWARE, see https://argbash.dev for more info
1414

@@ -49,6 +49,7 @@ print_help()
4949
parse_commandline()
5050
{
5151
_positionals_count=0
52+
local _key
5253
while test $# -gt 0
5354
do
5455
_key="$1"

0 commit comments

Comments
 (0)