Fixed argbas-1to2 script bug

.gitignore

@@ -2,8 +2,6 @@
 *2.sh
 *3.sh
 
-bin/argbash-*to*
-
 tests/regressiontests/test-standalone.sh
 tests/regressiontests/test.sh
 

ChangeLog

@@ -1,3 +1,10 @@
+1.4.2 (2016-08-02)
+------------------
+
+Bugfixes:
+
+* Fixed the broken `argbash-1to2` script.
+
 1.4.1 (2016-08-02)
 ------------------
 
@@ -12,7 +19,7 @@ New features:
 
 * Added the `ARGBASH_SET_INDENT` macro for indentation control.
 * Created scripts are more compliant to the https://www.shellcheck.net/ tool.
-* Introduced argbash-1to2 script for migration to Argbash2
+* Introduced `argbash-1to2` script for migration to Argbash2
 
 Bugfixes:
 

bin/argbash

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version=1.4.1
+version=1.4.2
 # DEFINE_SCRIPT_DIR()
 # ARG_POSITIONAL_SINGLE([input],[The input template file])
 # ARG_OPTIONAL_SINGLE([output],[o],[Name of the output file (pass '-' for stdout)],[-])
@@ -12,7 +12,7 @@ version=1.4.1
 
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v1.4.1 one line above ###
+### START OF CODE GENERATED BY Argbash v1.4.2 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, know your rights: https://github.com/matejak/argbash
 

resources/Makefile

@@ -101,7 +101,7 @@ version:
 	sed -i "1s/.*/$(VERSION) ($$(date -I))/" $(CHANGELOG)
 	touch $(M4_SRC)
 
-release: version $(GENPARSE) examples check
+release: version $(GENPARSE) $(ARGBASH_TO) examples check
 	sed -i "1s/([-0-9]+)/($$(date -I))/" $(CHANGELOG)
 
 tag:

resources/examples/minimal.sh

@@ -7,7 +7,7 @@
 # ARG_HELP([This is a minimal demo of Argbash potential])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v1.4.1 one line above ###
+### START OF CODE GENERATED BY Argbash v1.4.2 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, know your rights: https://github.com/matejak/argbash
 

resources/examples/simple-standalone.sh

@@ -7,7 +7,7 @@
 # ARG_HELP()
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v1.4.1 one line above ###
+### START OF CODE GENERATED BY Argbash v1.4.2 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, know your rights: https://github.com/matejak/argbash
 

resources/examples/simple-wrapper.sh

@@ -5,7 +5,7 @@
 # ARG_HELP([This program tells you size of files in a given directory in units you choose.])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v1.4.1 one line above ###
+### START OF CODE GENERATED BY Argbash v1.4.2 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, know your rights: https://github.com/matejak/argbash
 

resources/examples/simple.sh

@@ -8,7 +8,7 @@
 # ARGBASH_SET_INDENT([  ])
 # ARGBASH_GO()
 # needed because of Argbash --> m4_ignore([
-### START OF CODE GENERATED BY Argbash v1.4.1 one line above ###
+### START OF CODE GENERATED BY Argbash v1.4.2 one line above ###
 # Argbash is a bash code generator used to get arguments parsing right.
 # Argbash is FREE SOFTWARE, know your rights: https://github.com/matejak/argbash
 

src/argbash-1to2.m4

@@ -12,7 +12,9 @@ version=_ARGBASH_VERSION
 
 do_stuff ()
 {
-	sed 's/\(_ARG_\w\+\)/\L\1\l/g' "$_ARG_INPUT"
+	# We match $_ARG_FOO as well as ${ARG_FOO...
+	# and _ARGS_FOO
+	sed 's/\(\${\?_ARGS\?_\w\+\)/\L\1\l/g' "$infname"
 }
 
 outfname="$_ARG_OUTPUT"

src/stuff.m4

@@ -45,8 +45,11 @@ m4_define([_translit], [m4_translit(m4_translit([$1], [a-z], [A-Z]), [-], [_])])
 
 dnl
 dnl The operation on command names that converts them to variable names (where command values are stored)
-m4_define([_varname], [_arg_[]_translit([$1])])
-m4_define([_varname], [_ARG_[]_translit([$1])])
+m4_define([_arg_prefix], [[_arg_]])
+m4_define([_arg_prefix], [[_ARG_]])
+m4_define([_args_prefix], [[_args_]])
+m4_define([_args_prefix], [[_ARGS_]])
+m4_define([_varname], [_arg_prefix[]_translit([$1])])
 
 
 dnl

src/version

@@ -1 +1 @@
-1.4.1
+1.4.2