From 3294039a00f3aa65181ed23518dc5c73e0201268 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Sun, 17 Jul 2011 11:04:03 -0400
Subject: contrib/paclog-pkglist: rework as bash wrapping awk

Avoid some pain in awk's limited handling of command line arguments by
wrapping this in a Bash script. We also default to
@localstatedir@/log/pacman.log when no args are specified, meaning that
-h or --help is required to get the help message.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
---
 contrib/Makefile.am       |  4 ++-
 contrib/paclog-pkglist    | 57 ---------------------------------------
 contrib/paclog-pkglist.in | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 58 deletions(-)
 delete mode 100755 contrib/paclog-pkglist
 create mode 100755 contrib/paclog-pkglist.in

(limited to 'contrib')

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 31238b8f..69304a44 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -2,6 +2,7 @@ OURSCRIPTS = \
 	bacman \
 	pacdiff \
 	paclist \
+	paclog-pkglist \
 	pacscripts \
 	pacsearch
 
@@ -13,7 +14,7 @@ EXTRA_DIST = \
 	PKGBUILD.vim \
 	bacman.in \
 	bash_completion.in \
-	paclog-pkglist \
+	paclog-pkglist.in \
 	pacdiff.in \
 	paclist.in \
 	pacscripts.in \
@@ -51,6 +52,7 @@ bacman: $(srcdir)/bacman.in
 bash_completion: $(srcdir)/bash_completion.in
 pacdiff: $(srcdir)/pacdiff.in
 paclist: $(srcdir)/paclist.in
+paclog-pkglist: $(srcdir)/paclog-pkglist.in
 pacscripts: $(srcdir)/pacscripts.in
 pacsearch: $(srcdir)/pacsearch.in
 pactree: $(srcdir)/pactree.in
diff --git a/contrib/paclog-pkglist b/contrib/paclog-pkglist
deleted file mode 100755
index 2c66e634..00000000
--- a/contrib/paclog-pkglist
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/awk -f
-#
-# paclog-pkglist - Parse a log file into a list of currently installed packages
-#
-# Copyright (C) 2011 Dave Reisner <dave@archlinux.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-BEGIN {
-  if (ARGC < 2) {
-    printf "usage:   log2pkglist <pacman log>\n"
-    printf "example: log2pkglist /var/log/pacman.log\n"
-    exit
-  }
-}
-
-{
-  action  = $3
-  pkgname = $4
-  pkgver  = $5
-  upgver  = $7
-}
-
-NF == 5 && action == "installed" {
-  gsub(/[()]/, "", pkgver)
-  pkg[pkgname] = pkgver
-  next
-}
-
-NF == 7 && action == "upgraded" {
-  sub(/\)/, "", upgver)
-  pkg[pkgname] = upgver
-  next
-}
-
-NF == 5 && action == "removed" {
-  pkg[pkgname] = -1
-}
-
-END {
-  for (i in pkg) {
-    if (pkg[i] != -1) {
-      printf "%s %s\n",i,pkg[i]
-    }
-  }
-}
diff --git a/contrib/paclog-pkglist.in b/contrib/paclog-pkglist.in
new file mode 100755
index 00000000..4cf5e341
--- /dev/null
+++ b/contrib/paclog-pkglist.in
@@ -0,0 +1,68 @@
+#!/bin/bash
+#
+# paclog-pkglist - Parse a log file into a list of currently installed packages
+#
+# Copyright (C) 2011 Dave Reisner <dave@archlinux.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+export TEXTDOMAIN='pacman'
+export TEXTDOMAINDIR='/usr/share/locale'
+declare logfile=${1:-@localstatedir@/log/pacman.log}
+
+if [[ $1 ]]; then
+  if [[ $1 = -@(h|-help) ]]; then
+    printf 'usage:   %s [pacman log]\n' "${0##*/}"
+    printf 'example: %s @localstatedir@/log/pacman.log\n' "${0##*/}"
+    printf '\ndefaults to: @localstatedir@/log/pacman.log\n'
+    exit 0
+  elif [[ ! -e $logfile ]]; then
+    printf $"target not found: %s\n" "$1"
+    exit 1
+  fi
+fi
+
+<"$logfile" awk '
+{
+  action  = $3
+  pkgname = $4
+  pkgver  = $5
+  upgver  = $7
+}
+
+NF == 5 && action == "installed" {
+  gsub(/[()]/, "", pkgver)
+  pkg[pkgname] = pkgver
+  next
+}
+
+NF == 7 && action == "upgraded" {
+  sub(/\)/, "", upgver)
+  pkg[pkgname] = upgver
+  next
+}
+
+NF == 5 && action == "removed" {
+  pkg[pkgname] = -1
+}
+
+END {
+  for (i in pkg) {
+    if (pkg[i] != -1) {
+      printf "%s %s\n",i,pkg[i]
+    }
+  }
+}' | sort
+
+# vim: set ts=2 sw=2 noet:
-- 
cgit v1.2.3