From patchwork Mon Apr 24 00:55:19 2006
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Oliver Endriss <o.endriss@gmx.de>
X-Patchwork-Id: 12276
Received: from mail.gmx.de ([213.165.64.20] helo=mail.gmx.net)
	by www.linuxtv.org with smtp (Exim 4.50) id 1FXpNf-0006fG-Ir
	for vdr@linuxtv.org; Mon, 24 Apr 2006 02:56:47 +0200
Received: (qmail invoked by alias); 24 Apr 2006 00:56:15 -0000
Received: from p549AF972.dip.t-dialin.net (HELO cassiopeia.escape-edv.de)
	[84.154.249.114]
	by mail.gmx.net (mp040) with SMTP; 24 Apr 2006 02:56:15 +0200
X-Authenticated: #476490
Received: from orion (192.168.1.10) by cassiopeia.escape-edv.de
	(192.168.1.11) with esmtp ; Mon, 24 Apr 2006 02:55:59 +0200
From: Oliver Endriss <o.endriss@gmx.de>
Organization: ESCAPE GmbH EDV-Loesungen
To: vdr@linuxtv.org
Subject: Re: [vdr] [ANNOUNCE] VDR developer version 1.3.48
Date: Mon, 24 Apr 2006 02:55:19 +0200
User-Agent: KMail/1.6.2
References: <444B8B93.8000203@cadsoft.de>
In-Reply-To: <444B8B93.8000203@cadsoft.de>
MIME-Version: 1.0
Content-Disposition: inline
Message-Id: <200604240255.19855@orion.escape-edv.de>
X-Y-GMX-Trusted: 0
X-BeenThere: vdr@linuxtv.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: vdr@linuxtv.org
List-Id: VDR Mailing List <vdr.linuxtv.org>
List-Unsubscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=unsubscribe>
List-Archive: <http://www.linuxtv.org/pipermail/vdr>
List-Post: <mailto:vdr@linuxtv.org>
List-Help: <mailto:vdr-request@linuxtv.org?subject=help>
List-Subscribe: <http://www.linuxtv.org/cgi-bin/mailman/listinfo/vdr>,
	<mailto:vdr-request@linuxtv.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Apr 2006 00:56:47 -0000
Status: O
X-Status: 
X-Keywords: 
X-UID: 9029

Klaus Schmidinger wrote:
> VDR developer version 1.3.48 is now available at
> ...
> - Simplified the 'grep|awk|sed' command to retrieve the VDR/APIVERSION to a single
>    'sed' call.

(1) My sed does not accept lines like this:
| sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$/\1/; p }' config.h
| sed: -e expression #1, char 47: Extra characters after command

This works:
| sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$/\1/p; }' config.h
| 1.3.47

(2) The newplugin script is broken:
- references VDRVERSION, not APIVERSION
- '\' must be escaped
- sed problem as above

Patches attached.

Oliver

--- newplugin.old	Sun Apr 23 18:58:22 2006
+++ newplugin	Mon Apr 24 02:46:13 2006
@@ -85,7 +85,7 @@ TMPDIR = /tmp
 
 ### The version number of VDR's plugin API (taken from VDR's "config.h"):
 
-APIVERSION = \$(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*\$\$/\\1/; p }' \$(VDRDIR)/config.h)
+APIVERSION = \$(shell sed -ne '/define APIVERSION/ { s/^.*"\\(.*\\)".*\$\$/\\1/p; }' \$(VDRDIR)/config.h)
 
 ### The name of the distribution archive: