bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: maint.mk: sed portability


From: Jim Meyering
Subject: Re: maint.mk: sed portability
Date: Wed, 23 May 2012 11:23:16 +0200

Akim Demaille wrote:
> A simple sed syntax issue, and while at it, a small simplification.
>
> * top/maint.mk (gpg_key_ID): End blocks with a semicolon before
> the closing brace.
> (refresh-po): Fuse two sed invocations into one.

Thanks!
I've adjusted the log.
maint.mk is big; saying that only the gpg_key_ID-calculating code
is affected helps readers.

>From 72aed8790fb3ac4a4696906a624d1a8aaf034ec3 Mon Sep 17 00:00:00 2001
From: Akim Demaille <address@hidden>
Date: Wed, 23 May 2012 10:38:54 +0200
Subject: [PATCH] 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.
---
 ChangeLog    | 7 +++++++
 top/maint.mk | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e00c8bb..e111cfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-23  Akim Demaille  <address@hidden>
+
+       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  <address@hidden>

        gitlog-to-changelog: support the log message format used in Bison.
diff --git a/top/maint.mk b/top/maint.mk
index 1c7af03..8cea95b 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_ ?= address@hidden

@@ -1414,7 +1414,7 @@ refresh-po:
        wget --no-verbose --directory-prefix $(PODIR) --no-directories 
--recursive --level 1 --accept .po --accept .po.1 $(POURL) && \
        echo 'address@hidden' > $(PODIR)/LINGUAS && \
        echo 'address@hidden' >> $(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)
--
1.7.10.2.552.gaa3bb87



reply via email to

[Prev in Thread] Current Thread [Next in Thread]