From owner-svn-src-all@FreeBSD.ORG  Sun Jan 15 09:27:00 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ECAEC106566C;
	Sun, 15 Jan 2012 09:27:00 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DB9AD8FC0A;
	Sun, 15 Jan 2012 09:27:00 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0F9R00e072283;
	Sun, 15 Jan 2012 09:27:00 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0F9R0I9072281;
	Sun, 15 Jan 2012 09:27:00 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201150927.q0F9R0I9072281@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 15 Jan 2012 09:27:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r230128 - head/release
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Jan 2012 09:27:01 -0000

Author: glebius
Date: Sun Jan 15 09:27:00 2012
New Revision: 230128
URL: http://svn.freebsd.org/changeset/base/230128

Log:
  Use getopts instead of getopt(1).
  
  Suggested by:	jilles

Modified:
  head/release/generate-release.sh

Modified: head/release/generate-release.sh
==============================================================================
--- head/release/generate-release.sh	Sun Jan 15 08:36:25 2012	(r230127)
+++ head/release/generate-release.sh	Sun Jan 15 09:27:00 2012	(r230128)
@@ -27,23 +27,18 @@ usage()
 	exit 1
 }
 
-args=`getopt r: $*`
-if [ $? -ne 0 ]; then
-	usage
-fi
-set -- $args
 REVISION=
-while true; do
-	case "$1" in
-	-r)
-		REVISION="-r $2"
-		shift; shift
+while getopts r: opt; do
+	case $opt in
+	r)
+		REVISION="-r $OPTARG"
 		;;
-	--)
-		shift; break
+	\?)
+		usage
 		;;
 	esac
 done
+shift $(($OPTIND - 1))
 
 if [ $# -lt 2 ]; then
 	usage