Thu Jul 7 11:29:34 2016 UTC ()

Be less verbose.


(wiz)

diff -r1.28 -r1.29 pkgsrc/mk/scripts/mkreadme

--- pkgsrc/mk/scripts/mkreadme 2015/10/03 13:17:57 1.28
+++ pkgsrc/mk/scripts/mkreadme 2016/07/07 11:29:34 1.29

 @@ -1,15 +1,15 @@
 #!/bin/sh
-# $NetBSD: mkreadme,v 1.28 2015/10/03 13:17:57 bsiegert Exp $
+# $NetBSD: mkreadme,v 1.29 2016/07/07 11:29:34 wiz Exp $
+#
 # Script for README.html generation
+#
 # Copyright (c) 2002, 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Dan McMahill.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 @@ -260,51 +260,55 @@ echo "Starting README.html generation: `
 ######################################################################
+#
 #  Extract key pkgsrc configuration variables
+#
 ######################################################################
 echo " "
 echo "Extracting tool variables:"
 echo " "
 if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then
     cd ${PKGSRCDIR}/pkgtools/prereq-readme
     eval "`${BMAKE} show-tools`"
-    for v in AWK CMP ECHO EXPR FGREP FIND GREP GZIP_CMD SED SETENV SORT
+    if [ "x$quiet" != "xno" ]; then
-    do
+	for v in AWK CMP ECHO EXPR FGREP FIND GREP GZIP_CMD SED SETENV SORT
-	eval "echo '---->'  ${v}=\"\${${v}}\""
+	do
-    done
+	    eval "echo '---->'  ${v}=\"\${${v}}\""
 	done
     fi
 else
     echo "Error:   ${PKGSRCDIR}/pkgtools/prereq-readme does not seem to exist"
     exit 1
 fi
 echo " "
 echo "Extracting configuration variables:"
 echo " "
 if [ -d ${PKGSRCDIR}/pkgtools/prereq-readme ]; then
     cd ${PKGSRCDIR}/pkgtools/prereq-readme
     for v in CDROM_PKG_URL_HOST CDROM_PKG_URL_DIR DISTDIR \
 	FTP_PKG_URL_HOST FTP_PKG_URL_DIR PACKAGES PKG_INFO PKG_SUFX PKG_ADMIN \
 	AUDIT_PACKAGES AUDIT_PACKAGES_FLAGS PKGTOOLS_VERSION
     do
 	val=`${BMAKE} show-var VARNAME=${v}`
 	if [ $? != 0 ]; then
 	    echo "Error:  make show-var VARNAME=${v} in `pwd` "
 	    echo "Failed.  This is a fatal error"
 	    clean_and_exit
 	fi
-	echo "---->  ${v}=\"${val}\""
+	if [ "x$quiet" != "xno" ]; then
 	    echo "---->  ${v}=\"${val}\""
 	fi
 	eval "${v}=\"${val}\""
     done
 else
     echo "Error:   ${PKGSRCDIR}/pkgtools/prereq-readme does not seem to exist"
     exit 1
 fi
 if [ `${PKG_ADMIN} -V` -lt 20080415 ]; then
 	SCAN_VULNERABILITIES=0
 	echo "---->  NOT checking for vulnerabilities, pkg_install too old"
 else
 	_PVDIR=`${PKG_ADMIN} config-var PKGVULNDIR`;
 	if [ -e "${_PVDIR}"/pkg-vulnerabilities ]; then