From owner-svn-src-head@FreeBSD.ORG Thu Mar 31 01:26:18 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A7C20106564A; Thu, 31 Mar 2011 01:26:18 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-iy0-f182.google.com (mail-iy0-f182.google.com [209.85.210.182]) by mx1.freebsd.org (Postfix) with ESMTP id 46EDF8FC16; Thu, 31 Mar 2011 01:26:18 +0000 (UTC) Received: by iyj12 with SMTP id 12so2378986iyj.13 for ; Wed, 30 Mar 2011 18:26:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=jy/2Ls3Vr08SXeNeGkjAItzFMDxP2/NcahZQXYrsNWY=; b=uuIdHGe5hei6uRRk1M4iVSC1C74l7odVheHX8fItTb5+nilT5rNQqJ6gJr71AzPzDj IwZ0lyf9Zepl3p77/zSDNAE6EcFBC2JTyzKOCSOCkUXRDNEHgnn5zNvdLkyv+tCTurls 9YtPIUH9cWx8KQBRqskhzoRDeFXHYqZ8Kb5hE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=HO3A5llL/tRvoWDs/tpwEmHsLIutmOQa5jUku6cfPK7niUKeIrO0Vf70y/VIh4l8X8 ApiTTUsH07BULieChVzSztUWYyWR5+nPvosMCpOLTlJ2gY3o6TDvtmpcmvXBJ+B+4Hcd fypMKOuqX3TWE9UexWFdw43PUFxF/iwCXwyMk= MIME-Version: 1.0 Received: by 10.43.45.7 with SMTP id ui7mr1946638icb.262.1301534775964; Wed, 30 Mar 2011 18:26:15 -0700 (PDT) Received: by 10.231.168.74 with HTTP; Wed, 30 Mar 2011 18:26:15 -0700 (PDT) In-Reply-To: <201103301737.p2UHb4j7070331@svn.freebsd.org> References: <201103301737.p2UHb4j7070331@svn.freebsd.org> Date: Wed, 30 Mar 2011 18:26:15 -0700 Message-ID: From: Garrett Cooper To: Josh Paetzel Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r220162 - head/usr.sbin/pc-sysinstall/backend-partmanager X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Mar 2011 01:26:18 -0000 On Wed, Mar 30, 2011 at 10:37 AM, Josh Paetzel wrote= : > Author: jpaetzel > Date: Wed Mar 30 17:37:04 2011 > New Revision: 220162 > URL: http://svn.freebsd.org/changeset/base/220162 > > Log: > =A0Check in two missing files missed in cleanup. > =A0Change expr to $(()) > =A0Switch test from "$?" =3D "0" to $? -eq 0 > > =A0Approved by: =A0kib (mentor) > > Modified: > =A0head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh > =A0head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh > > Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh =A0 = =A0 =A0Wed Mar 30 17:33:52 2011 =A0 =A0 =A0 =A0(r220161) > +++ head/usr.sbin/pc-sysinstall/backend-partmanager/create-part.sh =A0 = =A0 =A0Wed Mar 30 17:37:04 2011 =A0 =A0 =A0 =A0(r220162) > @@ -85,7 +85,7 @@ fi > > =A0# If this is an empty disk, see if we need to create a new scheme for = it > =A0gpart show ${DISK} >/dev/null 2>/dev/null > -if [ "$?" !=3D "0" -a "${SLICENUM}" =3D "1" ] ; then > +if [ $? -eq 0 -a "${SLICENUM}" =3D "1" ] ; then > =A0gpart create -s ${TYPE} ${DISK} > =A0fi > > > Modified: head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh =A0 = =A0 =A0Wed Mar 30 17:33:52 2011 =A0 =A0 =A0 =A0(r220161) > +++ head/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh =A0 = =A0 =A0Wed Mar 30 17:37:04 2011 =A0 =A0 =A0 =A0(r220162) > @@ -57,10 +57,10 @@ PARTINDEX=3D"" > =A0while > =A0z=3D1 > =A0do > - =A0CHARS=3D`expr $CHARS - 1` > + =A0CHARS=3D$((CHARS-1)) This can also be done with the null operator: : $(( CHARS -=3D 1 )) it's the way that the LTP project (which I'm still a member of) does things in order to be 'portable' (non-portable being bash/korn shell isms for what little it's worth :)..). > =A0 LAST_CHAR=3D`echo "${PARTITION}" | cut -c $CHARS` > - =A0echo "${LAST_CHAR}" | grep "^[0-9]$" >/dev/null 2>/dev/null > - =A0if [ "$?" =3D "0" ] ; then > + =A0echo "${LAST_CHAR}" | grep -q "^[0-9]$" 2>/dev/null > + =A0if [ $? -eq 0 ] ; then > =A0 =A0 PARTINDEX=3D"${LAST_CHAR}${PARTINDEX}" > =A0 else > =A0 =A0 break Thanks! -Garrett