From: Akim Demaille <akim@lrde.epita.fr>
Date: Wed, 23 May 2012 08:38:54 +0000 (+0200)
Subject: maint.mk: gpg_key_ID: use sed more portably
X-Git-Tag: v0.1~652
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=72aed8790fb3ac4a4696906a624d1a8aaf034ec3;p=gnulib.git

maint.mk: gpg_key_ID: use sed more portably

* top/maint.mk (gpg_key_ID): End sed block with a semicolon before
the closing brace.
(refresh-po): Fuse two sed invocations into one.
---

diff --git a/ChangeLog b/ChangeLog
index e00c8bb5a..e111cfa04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-23  Akim Demaille  <akim@lrde.epita.fr>
+
+	maint.mk: gpg_key_ID: use sed more portably
+	* top/maint.mk (gpg_key_ID): End sed block with a semicolon before
+	the closing brace.
+	(refresh-po): Fuse two sed invocations into one.
+
 2012-05-15  Akim Demaille  <akim@lrde.epita.fr>
 
 	gitlog-to-changelog: support the log message format used in Bison.
diff --git a/top/maint.mk b/top/maint.mk
index 1c7af0365..8cea95b25 100644
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -1234,7 +1234,7 @@ bootstrap-tools ?= autoconf,automake,gnulib
 gpg_key_ID ?= \
   $$(git cat-file tag v$(VERSION) \
      | gpgv --status-fd 1 --keyring /dev/null - - 2>/dev/null \
-     | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q}')
+     | sed -n '/^\[GNUPG:\] ERRSIG /{s///;s/ .*//p;q;}')
 
 translation_project_ ?= coordinator@translationproject.org
 
@@ -1414,7 +1414,7 @@ refresh-po:
 	wget --no-verbose --directory-prefix $(PODIR) --no-directories --recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
 	echo 'en@boldquot' > $(PODIR)/LINGUAS && \
 	echo 'en@quot' >> $(PODIR)/LINGUAS && \
-	ls $(PODIR)/*.po | sed 's/\.po//' | sed 's,$(PODIR)/,,' | sort >> $(PODIR)/LINGUAS
+	ls $(PODIR)/*.po | sed 's/\.po//;s,$(PODIR)/,,' | sort >> $(PODIR)/LINGUAS
 
  # Running indent once is not idempotent, but running it twice is.
 INDENT_SOURCES ?= $(C_SOURCES)