From owner-svn-src-user@freebsd.org  Fri Oct  9 20:30:28 2020
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id A493F42C1C6
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Fri,  9 Oct 2020 20:30:28 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C7KT03sVqz4r1k;
 Fri,  9 Oct 2020 20:30:28 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 639AC1F29A;
 Fri,  9 Oct 2020 20:30:28 +0000 (UTC)
 (envelope-from gordon@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 099KUS1C037609;
 Fri, 9 Oct 2020 20:30:28 GMT (envelope-from gordon@FreeBSD.org)
Received: (from gordon@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 099KUSHf037608;
 Fri, 9 Oct 2020 20:30:28 GMT (envelope-from gordon@FreeBSD.org)
Message-Id: <202010092030.099KUSHf037608@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gordon set sender to
 gordon@FreeBSD.org using -f
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Fri, 9 Oct 2020 20:30:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r366586 - user/cperciva/freebsd-update-build
X-SVN-Group: user
X-SVN-Commit-Author: gordon
X-SVN-Commit-Paths: user/cperciva/freebsd-update-build
X-SVN-Commit-Revision: 366586
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Oct 2020 20:30:28 -0000

Author: gordon
Date: Fri Oct  9 20:30:27 2020
New Revision: 366586
URL: https://svnweb.freebsd.org/changeset/base/366586

Log:
  Change job handling to use the same construct I moved to later.
  
  This could probably be abstracted into a function.

Modified:
  user/cperciva/freebsd-update-build/build-upgrade-patches.sh

Modified: user/cperciva/freebsd-update-build/build-upgrade-patches.sh
==============================================================================
--- user/cperciva/freebsd-update-build/build-upgrade-patches.sh	Fri Oct  9 20:28:46 2020	(r366585)
+++ user/cperciva/freebsd-update-build/build-upgrade-patches.sh	Fri Oct  9 20:30:27 2020	(r366586)
@@ -82,13 +82,8 @@ zcat ${WWWDIR}/${TARGETREL}/${ARCH}/m/* |
 
 	genpatch &
 
-	jobs="$(jobs)"
-	numjobs=$(echo "$jobs" | wc -l)
-	while [ $numjobs -ge $MAXJOBS ]; do
+	while [ $(ls -d ${TMPDIR:-/tmp}/genpatch* 2>/dev/null | wc -l) -ge $MAXJOBS ]; do
 		sleep 2
-
-		jobs="$(jobs)"
-		numjobs=$(echo "$jobs" | wc -l)
 	done
     done