Merge pull request #105 from matejak/perms

Fixed incorrect permission of generated non-script output files.

Author: matejak

ChangeLog

@@ -1,7 +1,10 @@
 2.9.0 (TBA)
 ------------------
 
+Buxfixes:
+
 *  Fixed typo in `argbash-init` and updated obsolete/incaccurate hints (#97).
+*  Fixed incorrect permission of non-script output files (#104).
 
 
 2.8.1 (2019-06-30)

bin/argbash

@@ -30,11 +30,10 @@
 
 die()
 {
-	local _ret=$2
-	test -n "$_ret" || _ret=1
-	test "$_PRINT_HELP" = yes && print_help >&2
+	local _ret="${2:-1}"
+	test "${_PRINT_HELP:-no}" = yes && print_help >&2
 	echo "$1" >&2
-	exit ${_ret}
+	exit "${_ret}"
 }
 
 # validators
@@ -407,6 +406,18 @@ get_parsing_code()
 	echo "$_newerfile"
 }
 
+
+# $1: The output file
+# $2: The output type string
+set_output_permission()
+{
+	if grep -q '\<script\>' <<< "$2"
+	then
+		chmod a+x "$1"
+	fi
+}
+
+
 # MS Windows compatibility fix
 discard=/dev/null
 test -e $discard || discard=NUL
@@ -466,7 +477,7 @@ fi
 if test "$outfname" != '-'
 then
 	printf "%s\\n" "$output" > "$outfname"
-	chmod a+x "$outfname"
+	set_output_permission "$outfname" "$_arg_type"
 else
 	printf "%s\\n" "$output"
 fi

bin/argbash-1to2

@@ -18,11 +18,10 @@ version=2.8.1
 
 die()
 {
-	local _ret=$2
-	test -n "$_ret" || _ret=1
-	test "$_PRINT_HELP" = yes && print_help >&2
+	local _ret="${2:-1}"
+	test "${_PRINT_HELP:-no}" = yes && print_help >&2
 	echo "$1" >&2
-	exit ${_ret}
+	exit "${_ret}"
 }
 
 

bin/argbash-init

@@ -26,11 +26,10 @@ version=2.8.1
 
 die()
 {
-	local _ret=$2
-	test -n "$_ret" || _ret=1
-	test "$_PRINT_HELP" = yes && print_help >&2
+	local _ret="${2:-1}"
+	test "${_PRINT_HELP:-no}" = yes && print_help >&2
 	echo "$1" >&2
-	exit ${_ret}
+	exit "${_ret}"
 }
 
 # validators

src/argbash.m4

@@ -190,6 +190,18 @@ get_parsing_code()
 	echo "$_newerfile"
 }
 
+
+# $1: The output file
+# $2: The output type string
+set_output_permission()
+{
+	if grep -q '\<script\>' <<< "$2"
+	then
+		chmod a+x "$1"
+	fi
+}
+
+
 # MS Windows compatibility fix
 discard=/dev/null
 test -e $discard || discard=NUL
@@ -249,7 +261,7 @@ fi
 if test "$outfname" != '-'
 then
 	printf "%s\\n" "$output" > "$outfname"
-	chmod a+x "$outfname"
+	set_output_permission "$outfname" "$_arg_type"
 else
 	printf "%s\\n" "$output"
 fi

tests/regressiontests/Makefile

@@ -563,6 +563,7 @@ basic-docopt: $(TESTDIR)/basic.txt
 	grep -q "\[<pos-opt>\]" $<
 	grep -q "\[--opt_arg OPT_ARG\]" $<
 	grep -q "\s-o OPT_ARG, --opt_arg OPT_ARG\s" $<
+	! test -x $<
 
 test-onlyopt-docopt: $(TESTDIR)/test-onlyopt.txt
 	grep -q "\[--opt-repeated OPT-REPEATED\]\.\.\." $<

tests/regressiontests/make/tests/tests-docopt.m4

@@ -2,6 +2,7 @@ ADD_DOCOPT_TEST([basic], [[
 	grep -q "\[<pos-opt>\]" $<
 	grep -q "\[--opt_arg OPT_ARG\]" $<
 	grep -q "\s-o OPT_ARG, --opt_arg OPT_ARG\s" $<
+	! test -x $<
 ]])
 
 ADD_DOCOPT_TEST([test-onlyopt], [[