From owner-svn-src-all@FreeBSD.ORG  Wed Mar 30 17:37:04 2011
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 7CAD8106566B;
	Wed, 30 Mar 2011 17:37:04 +0000 (UTC)
	(envelope-from jpaetzel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A2788FC0C;
	Wed, 30 Mar 2011 17:37:04 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2UHb4MA070334;
	Wed, 30 Mar 2011 17:37:04 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Received: (from jpaetzel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2UHb4j7070331;
	Wed, 30 Mar 2011 17:37:04 GMT
	(envelope-from jpaetzel@svn.freebsd.org)
Message-Id: <201103301737.p2UHb4j7070331@svn.freebsd.org>
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Wed, 30 Mar 2011 17:37:04 +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: r220162 -
	head/usr.sbin/pc-sysinstall/backend-partmanager
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: Wed, 30 Mar 2011 17:37:04 -0000

Author: jpaetzel
Date: Wed Mar 30 17:37:04 2011
New Revision: 220162
URL: http://svn.freebsd.org/changeset/base/220162

Log:
  Check in two missing files missed in cleanup.
  Change expr to $(())
  Switch test from "$?" = "0" to $? -eq 0
  
  Approved by:	kib (mentor)

Modified:
  head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
  head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh

Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh	Wed Mar 30 17:33:52 2011	(r220161)
+++ head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh	Wed Mar 30 17:37:04 2011	(r220162)
@@ -85,7 +85,7 @@ fi
 
 # If this is an empty disk, see if we need to create a new scheme for it
 gpart show ${DISK} >/dev/null 2>/dev/null
-if [ "$?" != "0" -a "${SLICENUM}" = "1" ] ; then
+if [ $? -eq 0 -a "${SLICENUM}" = "1" ] ; then
  gpart create -s ${TYPE} ${DISK}
 fi
 

Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh	Wed Mar 30 17:33:52 2011	(r220161)
+++ head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh	Wed Mar 30 17:37:04 2011	(r220162)
@@ -57,10 +57,10 @@ PARTINDEX=""
 while 
 z=1
 do
-  CHARS=`expr $CHARS - 1`
+  CHARS=$((CHARS-1))
   LAST_CHAR=`echo "${PARTITION}" | cut -c $CHARS`
-  echo "${LAST_CHAR}" | grep "^[0-9]$" >/dev/null 2>/dev/null
-  if [ "$?" = "0" ] ; then
+  echo "${LAST_CHAR}" | grep -q "^[0-9]$" 2>/dev/null
+  if [ $? -eq 0 ] ; then
     PARTINDEX="${LAST_CHAR}${PARTINDEX}"
   else
     break