Merge pull request kivy#49 from nklever/patch-2

tito · tito · commit f07919bb0940 · 2012-09-28T09:05:51.000-07:00
hide "set -x" into an option
diff --git a/distribute.sh b/distribute.sh
@@ -62,6 +62,7 @@ CBLUE="\x1b[34;01m"
 CGRAY="\x1b[30;01m"
 CRESET="\x1b[39;49;00m"
 DO_CLEAN_BUILD=0
+DO_SET_X=0
 
 # Use ccache ?
 which ccache &>/dev/null
@@ -71,8 +72,6 @@ if [ $? -eq 0 ]; then
 	export NDK_CCACHE="ccache"
 fi
 
-set -x
-
 function try () {
     "$@" || exit -1
 }
@@ -209,6 +208,7 @@ function usage() {
 	echo "  -l                     Show a list of available modules"
 	echo "  -m 'mod1 mod2'         Modules to include"
 	echo "  -f                     Restart from scratch (remove the current build)"
+        echo "  -x                     display expanded values (execute 'set -x')"
 	echo
 	exit 0
 }
@@ -614,7 +614,7 @@ function arm_deduplicate() {
 
 
 # Do the build
-while getopts ":hvlfm:d:s" opt; do
+while getopts ":hvlfxm:d:s" opt; do
 	case $opt in
 		h)
 			usage
@@ -637,6 +637,9 @@ while getopts ":hvlfm:d:s" opt; do
 		f)
 			DO_CLEAN_BUILD=1
 			;;
+                x)
+                        DO_SET_X=1
+                        ;;
 		\?)
 			echo "Invalid option: -$OPTARG" >&2
 			exit 1
@@ -652,4 +655,9 @@ while getopts ":hvlfm:d:s" opt; do
 	esac
 done
 
+if [ $DO_SET_X -eq 1 ]; then
+	info "Set -x for displaying expanded values"
+	set -x
+fi
+
 run
