From 7c4199c42700f77707b1b5281e8578b5313828eb Mon Sep 17 00:00:00 2001
From: idl0r <idl0r@gentoo.org>
Date: Mon, 25 Oct 2010 17:00:36 +0000
Subject: [PATCH] Fix options. Add descriptions for -a|--no-auxfiles and
 -c|--no-changelog.

svn path=/trunk/gentoolkit-dev/; revision=821
---
 ChangeLog       |  2 ++
 src/ebump/ebump | 65 +++++++++++++++++++++++++++++--------------------
 2 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db498db..5195809 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-25: Christian Ruppert <idl0r@gentoo.org>
 	* ebump: Whitespace fixes.
+		Fix options. Add descriptions for -a|--no-auxfiles and -c|--no-changelog.
+
 
 2010-10-23: Christian Ruppert <idl0r@gentoo.org>
 	* echangelog: Fix version bump detection for hg/mercurial, bug 335636,
diff --git a/src/ebump/ebump b/src/ebump/ebump
index 58ffb1a..5de4413 100755
--- a/src/ebump/ebump
+++ b/src/ebump/ebump
@@ -19,7 +19,7 @@ die() {
 }
 
 einfo() {
-	if [ ${opt_verbosity} -gt 1 ] ; then
+	if [ ${opt_verbosity} -eq 1 ] ; then
 		echo $*
 	fi
 }
@@ -37,6 +37,8 @@ print_usage() {
 	echo "  -V|--version           show version info"
 	echo "  -v|--verbose           increase verbosity"
 	echo "  -q|--quiet             turn off output"
+	echo "  -a|--no-auxfiles       don't bump auxfiles (files/*)"
+	echo "  -c|--no-changelog      do not update ChangeLog (via echangelog)"
 	echo "  -C|--no-vcs            do not add to VCS"
 	echo "  -m|--message           append message to ChangeLog"
 	echo "  -d|--delete-old        delete previous revision from VCS (DANGEROUS!)"
@@ -322,8 +324,7 @@ original_params=${#}
 #
 # Global options
 #
-opt_verbosity=1
-opt_warn_on_delete=y
+opt_verbosity=0
 opt_add_changelog=y
 opt_add_vcs=y
 opt_bump_auxfiles=y
@@ -332,43 +333,53 @@ opt_commitmessage=""
 
 load_options
 
-skip=0
 while [ ${#} -gt 0 ] ; do
 	arg=${1}
 	shift
-	if [ ${skip} -gt 0 ] ; then
-	skip=$[skip-1]
-	else
+
 	case ${arg} in
-	-h|--help)
-		print_usage
-		exit 0
+		-h|--help)
+			print_usage
+			exit 0
 		;;
-	-m|--message)
-		opt_commitmessage="${1}"
-		skip=1
+		-m|--message)
+			opt_commitmessage="${1}"
+			shift
+			continue
 		;;
-	-C|--no-vcs)
-		opt_add_vcs=n
+		-a|--no-auxfiles)
+			opt_bump_auxfiles=n
+			continue
 		;;
-	-V|--version)
-		print_version
-		exit
+		-c|--no-changelog)
+			opt_add_changelog=n
+			continue
 		;;
-	-v|--verbose)
-		opt_verbosity=$[opt_verbosity + 1]
+		-C|--no-vcs)
+			opt_add_vcs=n
+			continue
 		;;
-	-q|--quiet)
-		opt_verbosity=0
+		-V|--version)
+			print_version
+			exit
 		;;
-	-d|--delete-old)
-		opt_delete_old=y
+		-v|--verbose)
+			opt_verbosity=1
+			continue
 		;;
-	*)
-		ebuild_arg=${arg}
+		-q|--quiet)
+			opt_verbosity=0
+			continue
+		;;
+		-d|--delete-old)
+			opt_delete_old=y
+			continue
+		;;
+		*)
+			ebuild_arg=${arg}
+			continue
 		;;
 	esac
-	fi
 done
 
 _vcs=$(get_vcs)
-- 
2.26.2