[PATCH] Replace sed with perl when setting up perl scripts.

[PATCH] Replace sed with perl when setting up perl scripts.

[Shawn Pearce]

next appears to be broken on MacOS X:

  INSTLIBDIR=`make -C perl -s --no-print-directory instlibdir` && \
  sed -e '1s|#!.*perl|#!/usr/bin/perl|1' \
      -e '2i\
          use lib (split(/:/, $ENV{GITPERLLIB} || '\'"$INSTLIBDIR"\''));' \
      -e 's|@@INSTLIBDIR@@|'"$INSTLIBDIR"'|g' \
      -e 's/@@GIT_VERSION@@/1.4.1.g659a/g' \
      git-archimport.perl >git-archimport+
  sed: 1: "2i use lib (split(/:/,  ...": command i expects \ followed by text
  make: *** [git-archimport] Error 1

I just spent half an hour messing around with the relevant Makefile
rule to try and get sed to be happy with this and I can't find the
magic necessary.  So I ported the sed to perl.  :-)

-->>-
Replace sed with perl when setting up perl scripts.

The sed magic to insert 'use lib' at the start of all
GIT Perl scripts wasn't working correctly on Mac OS X.
Replacing the sed invocations with perl invocations is
much more portable.

The replacement also has no negative impact on the build
as GIT cannot be compiled without the Git perl module,
which implies that perl is available and works.
---
 Makefile |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 8d429a0..e83d298 100644
--- a/Makefile
+++ b/Makefile
@@ -557,11 +557,12 @@ common-cmds.h: Documentation/git-*.txt
 $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl
 	rm -f $@ $@+
 	INSTLIBDIR=`$(MAKE) -C perl -s --no-print-directory instlibdir` && \
-	sed -e '1s|#!.*perl|#!$(PERL_PATH_SQ)|1' \
-	    -e '2i\
-	        use lib (split(/:/, $$ENV{GITPERLLIB} || '\'"$$INSTLIBDIR"\''));' \
-	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g' \
-	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+	$(PERL_PATH) -e '$$_=<>;print q{#!$(PERL_PATH_SQ)},qq{\n};' \
+	    -e 'print q{use lib (split(/:/, $$ENV{GITPERLLIB} || '\'"$$INSTLIBDIR"\''));},qq{\n};' \
+	    -e 'while(<>){' \
+	    -e 's|@@INSTLIBDIR@@|'"$$INSTLIBDIR"'|g;' \
+	    -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g;' \
+	    -e 'print;}' \
 	    $@.perl >$@+
 	chmod +x $@+
 	mv $@+ $@
-- 
1.4.1.gc48f

Re: [PATCH] Replace sed with perl when setting up perl scripts.

[Junio C Hamano]

Please try the replacement patch I sent to the list earlier in
response to Johannes's patch to the same problem.