Re: [PATCH] Fix git-instaweb breakage on MacOS X due to the limited sed functionality

From: Charles Bailey <charles@hashpling.org>
Date: Dec 19, 2007, 11:48 UTC
Message-ID: <20071219114823.GA28273@hashpling.org>
In-Reply-To: <CA30F61D-4AE1-4100-A632-20B5587EB4D0@wincent.com>

On Wed, Dec 19, 2007 at 12:43:12PM +0100, Wincent Colaiuta wrote:

Show 9 quoted lines

> El 19/12/2007, a las 12:36, Charles Bailey escribió:
> 
> >
> >I agree completely, but all the generated scripts output hard coded
> >paths so it would seem inconsistent not to qualify the path in this
> >case too.
> 
> It's not hard-coded, it's dynamic. Witness:
>

It's *output* hardcoded, it's dynamic during script generation.

A raw 'perl' in a shell script is dynamic during script run.

Show 20 quoted lines

> $ make PERL_PATH=/Volumes/Clon/usr/bin/perl
> $ head -1 git-add--interactive
> #!/Volumes/Clon/usr/bin/perl -w
> 
> > Would  @@PERL_PATH@@perl -p -e work, do you know?
> 
> I don't think so, but judging from the following section of the  
> Makefile, I think @@PERL@@ would. Why don't you give it a try?
> 
> $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
>         $(QUIET_GEN)$(RM) $@ $@+ && \
>         sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
>             -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
>             -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
>             -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
>             -e 's|@@HTMLDIR@@|$(htmldir_SQ)|g' \
>             $@.sh >$@+ && \
>         chmod +x $@+ && \
>         mv $@+ $@
>

git-instaweb is treated specially, so the answer is 'no, not yet', but I have a patch on the way.

Charles.