[PATH] sed -e '/RE/r rfile/' needs space in 'r rfile'

[PATH] sed -e '/RE/r rfile/' needs space in 'r rfile'

[Michal Rokos]

Johannes,

in commit 07002287f3e219a16a948a8a6eca0a41162a491f
you cleaned up 'replace ugly and unportable sed invocation' as you said.
Please note, that some SEDs (like HP-UX one) mandate a space between 'r' 
and 'rfile'.

Michal

Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>

diff --git a/Makefile b/Makefile
index 202f261..8f9881f 100644
--- a/Makefile
+++ b/Makefile
@@ -552,9 +553,9 @@ git-instaweb: git-instaweb.sh gitweb/git
 	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
 	    -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
-	    -e '/@@GITWEB_CGI@@/rgitweb/gitweb.cgi' \
+	    -e '/@@GITWEB_CGI@@/r gitweb/gitweb.cgi' \
 	    -e '/@@GITWEB_CGI@@/d' \
-	    -e '/@@GITWEB_CSS@@/rgitweb/gitweb.css' \
+	    -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
 	    -e '/@@GITWEB_CSS@@/d' \
 	    $@.sh > $@+
 	chmod +x $@+

-- 
Michal Rokos

NextSoft s.r.o.
Vyskočilova 1/1410
140 21 Praha 4
phone:  +420 267 224 311
fax:    +420 267 224 307
mobile: +420 736 646 591
e-mail: michal.rokos@nextsoft.cz

Re: [PATH] sed -e '/RE/r rfile/' needs space in 'r rfile'

[Johannes Schindelin]

Hi,

On Sat, 8 Jul 2006, Michal Rokos wrote:

> Johannes,

Could you Cc me next time you address me personally? There are times when 
I am too busy to read all the mails of all the lists, and your mail would 
have been not read by me at those occasions.

> in commit 07002287f3e219a16a948a8a6eca0a41162a491f
> you cleaned up 'replace ugly and unportable sed invocation' as you said.
> Please note, that some SEDs (like HP-UX one) mandate a space between 'r' 
> and 'rfile'.

Ack. Note that this is yet-another-reason to step away from scripts.

Ciao,
Dscho

Re: [PATH] sed -e '/RE/r rfile/' needs space in 'r rfile'

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

>> in commit 07002287f3e219a16a948a8a6eca0a41162a491f
>> you cleaned up 'replace ugly and unportable sed invocation' as you said.
>> Please note, that some SEDs (like HP-UX one) mandate a space between 'r' 
>> and 'rfile'.
>
> Ack. Note that this is yet-another-reason to step away from scripts.

Are you talking about doing this part in the Makefile in C ;-)?

Re: [PATH] sed -e '/RE/r rfile/' needs space in 'r rfile'

[Johannes Schindelin]

Hi,

On Sat, 8 Jul 2006, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> >> in commit 07002287f3e219a16a948a8a6eca0a41162a491f
> >> you cleaned up 'replace ugly and unportable sed invocation' as you said.
> >> Please note, that some SEDs (like HP-UX one) mandate a space between 'r' 
> >> and 'rfile'.
> >
> > Ack. Note that this is yet-another-reason to step away from scripts.
> 
> Are you talking about doing this part in the Makefile in C ;-)?

If it is not portable, then yes ;-)

But of course, you know the spirit this was written in: I had no way to 
test with sed on HP-UX, so I do not know if my change works there. 
However, I know that if it is C -- except for bugs in HP-UX's C compiler 
-- then it works on HP-UX as expected.

Ciao,
Dscho