From owner-svn-src-user@freebsd.org Thu Aug 23 02:14:52 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B6831109D686 for ; Thu, 23 Aug 2018 02:14:52 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 6ABB3791E9; Thu, 23 Aug 2018 02:14:52 +0000 (UTC) (envelope-from delphij@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 344A01BA79; Thu, 23 Aug 2018 02:14:52 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7N2Ep8x074273; Thu, 23 Aug 2018 02:14:51 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7N2Epcu074272; Thu, 23 Aug 2018 02:14:51 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201808230214.w7N2Epcu074272@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 23 Aug 2018 02:14:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r338224 - user/cperciva/portsnap-build/s X-SVN-Group: user X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: user/cperciva/portsnap-build/s X-SVN-Commit-Revision: 338224 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.27 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Aug 2018 02:14:53 -0000 Author: delphij Date: Thu Aug 23 02:14:51 2018 New Revision: 338224 URL: https://svnweb.freebsd.org/changeset/base/338224 Log: join(1) at r320210 changed -v's behavior to output the join field as first field, while previously join(1) would act like grep(1). Compensate this by explicitly specify output order, which will work for both versions. Reviewed by: cperciva Modified: user/cperciva/portsnap-build/s/fileset-findnew.sh user/cperciva/portsnap-build/s/fileset-mergedb.sh Modified: user/cperciva/portsnap-build/s/fileset-findnew.sh ============================================================================== --- user/cperciva/portsnap-build/s/fileset-findnew.sh Thu Aug 23 02:14:39 2018 (r338223) +++ user/cperciva/portsnap-build/s/fileset-findnew.sh Thu Aug 23 02:14:51 2018 (r338224) @@ -18,7 +18,7 @@ echo "`date`: Identifying new files" # Find new port tarballs sort -k 3,3 -t '|' ${FSETDIR}/filedb > ${TMP}/filedb.sorted sort -k 2,2 -t '|' ${INDEX} | - join -1 3 -2 2 -t '|' -v 2 ${TMP}/filedb.sorted - | + join -1 3 -2 2 -t '|' -v 2 -o 2.1,2.2 ${TMP}/filedb.sorted - | sort -k 1,1 -t '|' > ${FSETDIR}/filedb.news # Report new files @@ -29,7 +29,7 @@ cut -f 1 -d '|' < ${FSETDIR}/filedb.news | # Find new metadata files sort -k 3,3 -t '|' ${FSETDIR}/metadb > ${TMP}/metadb.sorted sort -k 2,2 -t '|' ${tINDEX} | - join -1 3 -2 2 -t '|' -v 2 ${TMP}/metadb.sorted - | + join -1 3 -2 2 -t '|' -v 2 -o 2.1,2.2 ${TMP}/metadb.sorted - | sort -k 1,1 -t '|' > ${FSETDIR}/metadb.news # Clean up temporary files Modified: user/cperciva/portsnap-build/s/fileset-mergedb.sh ============================================================================== --- user/cperciva/portsnap-build/s/fileset-mergedb.sh Thu Aug 23 02:14:39 2018 (r338223) +++ user/cperciva/portsnap-build/s/fileset-mergedb.sh Thu Aug 23 02:14:51 2018 (r338224) @@ -29,7 +29,7 @@ echo "`date`: Updating databases" sed -e "s/|/|${SNAPDATE}|/" ${INDEX} | sort -k 3,3 -t '|' > ${TMP}/new.dated sort -k 3,3 -t '|' ${FSETDIR}/filedb | - join -1 3 -2 3 -t '|' -v 1 - ${TMP}/new.dated | + join -1 3 -2 3 -t '|' -v 1 -o 1.1,1.2,1.3 - ${TMP}/new.dated | sort -k 1,1 -t '|' - ${TMP}/new.dated > ${FSETDIR}/filedb.tmp mv ${FSETDIR}/filedb.tmp ${FSETDIR}/filedb @@ -37,7 +37,7 @@ mv ${FSETDIR}/filedb.tmp ${FSETDIR}/filedb sed -e "s/|/|${SNAPDATE}|/" ${tINDEX} | sort -k 3,3 -t '|' > ${TMP}/new.dated sort -k 3,3 -t '|' ${FSETDIR}/metadb | - join -1 3 -2 3 -t '|' -v 1 - ${TMP}/new.dated | + join -1 3 -2 3 -t '|' -v 1 -o 1.1,1.2,1.3 - ${TMP}/new.dated | sort -k 1,1 -t '|' - ${TMP}/new.dated > ${FSETDIR}/metadb.tmp mv ${FSETDIR}/metadb.tmp ${FSETDIR}/metadb