[ANNOUNCE] VDR developer version 1.3.48

Message ID 200604240255.19855@orion.escape-edv.de
State New
Headers

Commit Message

Oliver Endriss April 24, 2006, 12:55 a.m. UTC
  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
  

Comments

Udo Richter April 24, 2006, 1:12 a.m. UTC | #1
Oliver Endriss wrote:
> This works:
> | sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$/\1/p; }' config.h

Well, in that variant the ; to separate the next command isn't needed 
any more, and the {  } isn't necessary any more neither.

Cheers,

Udo

PS: As I said, mine is shorter! ;b
  

Patch

--- 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: