svn commit: r338224 - user/cperciva/portsnap-build/s

[Xin LI]

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