From owner-svn-src-projects@FreeBSD.ORG Thu Mar 5 00:18:33 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BBF23649; Thu, 5 Mar 2015 00:18:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A7669A21; Thu, 5 Mar 2015 00:18:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t250IXkr076574; Thu, 5 Mar 2015 00:18:33 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t250IXYC076573; Thu, 5 Mar 2015 00:18:33 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201503050018.t250IXYC076573@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Thu, 5 Mar 2015 00:18:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r279608 - projects/release-pkg/release/scripts X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Mar 2015 00:18:33 -0000 Author: bapt Date: Thu Mar 5 00:18:32 2015 New Revision: 279608 URL: https://svnweb.freebsd.org/changeset/base/279608 Log: Simplify and clean awk script Suggested by: dteske Modified: projects/release-pkg/release/scripts/mtree-to-plist.awk Modified: projects/release-pkg/release/scripts/mtree-to-plist.awk ============================================================================== --- projects/release-pkg/release/scripts/mtree-to-plist.awk Thu Mar 5 00:13:42 2015 (r279607) +++ projects/release-pkg/release/scripts/mtree-to-plist.awk Thu Mar 5 00:18:32 2015 (r279608) @@ -1,35 +1,31 @@ #!/usr/bin/awk /^[^#]/ { gsub(/^\./,"", $1) - uname="" - gname="" - mode="" - flags="" - tags="" + uname = gname = mode = flags = tags = "" for (i=2; i<=NF; i++) { if ($i ~ /^uname=/) { uname=$i - gsub(/uname=/, "", uname); + gsub(/uname=/, "", uname) } else if ($i ~ /^gname=/) { gname=$i - gsub(/gname=/, "", gname); + gsub(/gname=/, "", gname) } else if ($i ~ /^mode=/) { mode=$i - gsub(/mode=/,"", mode); + gsub(/mode=/,"", mode) } else if ($i ~ /^flags=/) { flags=$i - gsub(/flags=/, "", flags); + gsub(/flags=/, "", flags) } else if ($i ~ /^tags=/) { tags=$i - gsub(/tags=/, "", tags); + gsub(/tags=/, "", tags) } } if (length(tags) == 0) next if (tags ~ /package=/) { - gsub(/package=/,"",tags); - gsub(/,/, "-", tags); - gsub(/runtime-/, "", tags); + gsub(/package=/,"",tags) + gsub(/,/, "-", tags) + gsub(/runtime-/, "", tags) pkg=tags } else { pkg=tags