[gentoo-commits] proj/emacs-tools:emacs-updater commit in: /

["Sebastian Pipping" <sping@gentoo.org>]

commit:     bc4e5689c58ffd2870da87973a2d609ab126807b
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan  5 11:11:27 2011 +0000
Commit:     Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Wed Jan  5 11:11:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=bc4e5689

Use wc instead of sed for line counting. Postpone "no packages" message.

svn path=/emacs-updater/; revision=1641

---
 ChangeLog     |    6 ++++++
 emacs-updater |   18 +++++++++---------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e13f8f2..a100b11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-05  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs-updater: Use wc instead of sed for line counting; the
+	latter did not work for empty files. Postpone message that no
+	packages have been found.
+
 2010-11-27  Ulrich Mueller  <ulm@gentoo.org>
 
 	* emacs-updater (have_paludis, pm_paludis): Use cave instead of

diff --git a/emacs-updater b/emacs-updater
index d2cb91e..59ac937 100755
--- a/emacs-updater
+++ b/emacs-updater
@@ -273,8 +273,8 @@ if [ ! -s "${TMPFILE}" ]; then
     exit 3
 fi
 
-NO_OF_FILES=$(sed -n '$=' "${TMPFILE}")
-[ ${NO_OF_FILES} -eq 1 ] && s= || s=s
+NO_OF_FILES=$(wc -l <"${TMPFILE}")
+[ "${NO_OF_FILES}" -eq 1 ] && s= || s=s
 message "Assigning ${NO_OF_FILES} file${s} to packages ..."
 
 if [ "${ORPHANS}" ]; then
@@ -287,13 +287,8 @@ else
     # qfile -eqCR -f "${TMPFILE}" | sort -u | xargs qlist -eqCILS
 fi
 
-if [ ! -s "${PKGFILE}" ]; then
-    warning "No packages to update, quitting."
-    exit 3
-fi
-
-NO_OF_PACKAGES=$(sed -n '$=' "${PKGFILE}")
-[ ${NO_OF_PACKAGES} -eq 1 ] && s= || s=s
+NO_OF_PACKAGES=$(wc -l <"${PKGFILE}")
+[ "${NO_OF_PACKAGES}" -eq 1 ] && s= || s=s
 if [ "${ORPHANS}" ]; then
     message "${NO_OF_PACKAGES} orphan file${s} found:"
 else
@@ -307,6 +302,11 @@ if [ "${PRETEND}" -o "${ORPHANS}" ]; then
 fi
 
 echo
+if [ "${NO_OF_PACKAGES}" -eq 0 ]; then
+    warning "No packages to update, quitting."
+    exit 3
+fi
+
 if [ "${BATCH}" ]; then
     message "Remerging packages ..."
 else