Date: Wed, 4 Dec 2013 10:12:48 +0100 From: Baptiste Daroussin <bapt@FreeBSD.org> To: Glen Barber <gjb@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r258854 - head/usr.sbin/bsdconfig/share Message-ID: <20131204091248.GQ27759@ithaqua.etoilebsd.net> In-Reply-To: <201312021902.rB2J2x0o032333@svn.freebsd.org> References: <201312021902.rB2J2x0o032333@svn.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Mon, Dec 02, 2013 at 07:02:59PM +0000, Glen Barber wrote: > Author: gjb > Date: Mon Dec 2 19:02:58 2013 > New Revision: 258854 > URL: http://svnweb.freebsd.org/changeset/base/258854 > > Log: > Fix PKG_ABI detection in bsdconfig(8) after pkg-1.2 is released, since > the format of 'pkg -vv' output has changed. > > MFC after: 3 days > Sponsored by: The FreeBSD Foundation > > Modified: > head/usr.sbin/bsdconfig/share/common.subr > > Modified: head/usr.sbin/bsdconfig/share/common.subr > ============================================================================== > --- head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 18:47:57 2013 (r258853) > +++ head/usr.sbin/bsdconfig/share/common.subr Mon Dec 2 19:02:58 2013 (r258854) > @@ -65,7 +65,7 @@ export UNAME_R="$(uname -r)" # Release L > if [ ! "${PKG_ABI+set}" ]; then > export PKG_ABI="$( > ASSUME_ALWAYS_YES=1 pkg -vv | > - awk '$1=="ABI:"{print $2;exit}' 2> /dev/null > + awk '$1=="ABI"{print $3;exit}' 2> /dev/null > )" > fi You have: "pkg config abi" now :) that should allow you do avoid the awk :) regards, Bapt [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (FreeBSD) iEYEARECAAYFAlKe8hAACgkQ8kTtMUmk6ExYtACeIVIR/Ojuq8So1dpaGMFxcN7a 0tMAoJGpb7fVmgL2YMRl/VuoL5Efk9hM =6Khw -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131204091248.GQ27759>