Merge pull request #111 from matejak/fix_inplace

Added the in-place option to the .m4 source.

Author: matejak

bin/argbash

@@ -469,8 +469,9 @@ then
 fi
 
 test -f "$infile" || _PRINT_HELP=yes die "argument '$infile' is supposed to be a file!" 1
-if [ $_arg_in_place = on ]; then
-	_arg_output=$infile
+if test "$_arg_in_place" = on
+then
+	_arg_output="$infile"
 fi
 test -n "$_arg_output" || { echo "The output can't be blank - it is not a legal filename!" >&2; exit 1; }
 outfname="$_arg_output"
@@ -505,5 +506,4 @@ else
 	printf "%s\\n" "$output"
 fi
 
-# #  <-- needed because of Argbash
-# ] <-- needed because of Argbash
+# # ] <-- needed because of Argbash

bin/argbash-init

@@ -416,7 +416,7 @@ else
 			do_script_separate "$parsing_library_file" > "$outfname"
 		fi
 	fi
-	chmod a+x -- "$outfname"
+	chmod a+x "$outfname"
 fi
 
 #

src/argbash.m4

@@ -8,6 +8,7 @@
 # DEFINE_SCRIPT_DIR
 # ARG_POSITIONAL_SINGLE([input], [The input template file (pass '-' for stdin)])
 # ARG_OPTIONAL_SINGLE([output], o, [Name of the output file (pass '-' for stdout)], -)
+# ARG_OPTIONAL_BOOLEAN([in-place], [i], [Update a bash script in-place], [off])
 # ARG_OPTIONAL_SINGLE([type], t, [Output type to generate], [bash-script])
 # ARG_OPTIONAL_BOOLEAN([library],, [Whether the input file if the pure parsing library])
 # ARG_OPTIONAL_SINGLE([strip],, [Determines what to have in the output], [none])
@@ -214,6 +215,11 @@ trap cleanup EXIT
 # If we are reading from stdout, then create a temp file
 if test "$infile" = '-'
 then
+	if test "$_arg_in_place" = 'on'
+	then
+		echo "Cannot use stdin input with --in-place option!" >&2
+		exit 1;
+	fi
 	infile=temp_in_$$
 	_files_to_clean+=("$infile")
 	cat > "$infile"
@@ -233,6 +239,10 @@ then
 fi
 
 test -f "$infile" || _PRINT_HELP=yes die "argument '$infile' is supposed to be a file!" 1
+if test "$_arg_in_place" = on
+then
+	_arg_output="$infile"
+fi
 test -n "$_arg_output" || { echo "The output can't be blank - it is not a legal filename!" >&2; exit 1; }
 outfname="$_arg_output"
 autom4te --version > "$discard" 2>&1 || { echo "You need the 'autom4te' utility (it comes with 'autoconf'), if you have bash, that one is an easy one to get." 2>&1; exit 1; }