From owner-freebsd-current@FreeBSD.ORG  Thu Sep  9 11:56:48 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id D258816A4CE; Thu,  9 Sep 2004 11:56:48 +0000 (GMT)
Received: from electra.cse.Buffalo.EDU (electra.cse.Buffalo.EDU
	[128.205.32.2])	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6F66E43D5A; Thu,  9 Sep 2004 11:56:48 +0000 (GMT)
	(envelope-from kensmith@cse.Buffalo.EDU)
Received: from electra.cse.Buffalo.EDU (kensmith@localhost [127.0.0.1])
	i89BueTH017566;	Thu, 9 Sep 2004 07:56:40 -0400 (EDT)
Received: (from kensmith@localhost)
	by electra.cse.Buffalo.EDU (8.12.10/8.12.9/Submit) id i89Bue8l017565;
	Thu, 9 Sep 2004 07:56:40 -0400 (EDT)
Date: Thu, 9 Sep 2004 07:56:40 -0400
From: Ken Smith <kensmith@cse.Buffalo.EDU>
To: Ruslan Ermilov <ru@FreeBSD.org>,
	Ruben de Groot <mail25@bzerk.org>, freebsd-current@FreeBSD.org
Message-ID: <20040909115640.GA17338@electra.cse.Buffalo.EDU>
References: <20040909075928.GA50494@ei.bzerk.org>
	<20040909083641.GA44288@ip.net.ua>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20040909083641.GA44288@ip.net.ua>
User-Agent: Mutt/1.4.1i
Subject: Re: release build breaks in src/release/scripts/split-file.sh
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Sep 2004 11:56:48 -0000

On Thu, Sep 09, 2004 at 11:36:42AM +0300, Ruslan Ermilov wrote:

> Yes.  This has been fixed in HEAD on August 26.
> 
> re@, should I MFC this into RELENG_5?
> 
> %%%
> Index: Makefile
> ===================================================================
> RCS file: /home/ncvs/src/release/Makefile,v
> retrieving revision 1.853.2.1
> diff -u -r1.853.2.1 Makefile
> --- Makefile	29 Aug 2004 05:37:20 -0000	1.853.2.1
> +++ Makefile	9 Sep 2004 08:22:07 -0000
> @@ -1081,7 +1081,7 @@
>  	    ${RD}/floppyset/${FLOPPYBASE} ${FLPSPLITSIZE} "${FLOPPYDESC}"
>  	( splitfile=${SPLITDIR}/`basename ${SPLITFILE}`.split ; \
>  	lines=`cat $${splitfile} | wc -l`; \
> -	lines=$$((lines - 1)) ; \
> +	lines=$$(($$lines - 1)) ; \
>  	for line in `jot $$lines`; do \
>  		file=`head -n $$(($${line} + 1)) $${splitfile} | tail -1 | cut -f 1 -d ' '` ; \
>  		sh -e ${DOFS_SH} ${RD}/floppies/${FLOPPYBASE}$${line}.flp \
> Index: scripts/split-file.sh
> ===================================================================
> RCS file: /home/ncvs/src/release/scripts/split-file.sh,v
> retrieving revision 1.1
> diff -u -r1.1 split-file.sh
> --- scripts/split-file.sh	26 Jan 2004 19:45:09 -0000	1.1
> +++ scripts/split-file.sh	9 Sep 2004 08:22:14 -0000
> @@ -35,5 +35,5 @@
>  i=1
>  for file in ${files}; do
>  	echo `basename ${file}` "\"${DESCR} floppy ${i}\"" >> ${DEST}/${prefix}.split
> -	i=$((i + 1))
> +	i=$(($i + 1))
>  done
> %%%

Yes please.  Thanks.

-- 
						Ken Smith
- From there to here, from here to      |       kensmith@cse.buffalo.edu
  there, funny things are everywhere.   |
                      - Theodore Geisel |