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

From: Wincent Colaiuta <win@wincent.com>
Date: Dec 19, 2007, 11:43 UTC
Message-ID: <CA30F61D-4AE1-4100-A632-20B5587EB4D0@wincent.com>
In-Reply-To: <20071219113617.GA26520@hashpling.org>

El 19/12/2007, a las 12:36, Charles Bailey escribió:

Show 16 quoted lines

> On Wed, Dec 19, 2007 at 12:28:04PM +0100, Wincent Colaiuta wrote:
>>
>> I think it's a bad idea to hard-code the perl path there; the
>> generated scripts only assume /usr/bin/perl if the user hasn't
>> overridden it at build time:
>>
>> 	PERL_PATH=/foo/perl make ...
>>
>> Using just this should work fine anyway:
>>
>> 	perl -p -e ...
>>
>
> 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:

$ 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 $@+ $@

Cheers, Wincent