Using 'perl' in *.sh

Some GIT's shell script are using bare 'perl' for perl invocation.
Use @@PERL@@ symbol and replace it with PERL_PATH_SQ everywhere.

Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index 5a625b4efa1c36a85a1928d049c892f9af72bf8e..588d9255d3288d07089b284ef6467cd57449bce8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -514,6 +514,7 @@ common-cmds.h: Documentation/git-*.txt
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
        rm -f $@ $@+
        sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
        rm -f $@ $@+
        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/@@NO_PYTHON@@/$(NO_PYTHON)/g' \
            -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
            -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
            -e 's/@@NO_PYTHON@@/$(NO_PYTHON)/g' \

diff --git a/git-bisect.sh b/git-bisect.sh
index 03df1433ef12014584f23f16e65124c219c2f466..06a8d26945a679b06438308ceb96c69cd76c43db 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -13,7 +13,7 @@ git bisect log                        show bisect log.'
 . git-sh-setup
 
 sq() {
 . git-sh-setup
 
 sq() {

-       perl -e '
+       @@PERL@@ -e '

                for (@ARGV) {
                        s/'\''/'\'\\\\\'\''/g;
                        print " '\''$_'\''";
                for (@ARGV) {
                        s/'\''/'\'\\\\\'\''/g;
                        print " '\''$_'\''";

diff --git a/git-clone.sh b/git-clone.sh
index 6a14b2591136d0bbfbec333c2304a7f003134ac2..036880388370a955deba19da1194600a420baef4 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -324,7 +324,7 @@ test -d "$GIT_DIR/refs/reference-tmp" && rm -fr "$GIT_DIR/refs/reference-tmp"
 if test -f "$GIT_DIR/CLONE_HEAD"
 then
        # Read git-fetch-pack -k output and store the remote branches.
 if test -f "$GIT_DIR/CLONE_HEAD"
 then
        # Read git-fetch-pack -k output and store the remote branches.

-       perl -e "$copy_refs" "$GIT_DIR" "$use_separate_remote" "$origin"
+       @@PERL@@ -e "$copy_refs" "$GIT_DIR" "$use_separate_remote" "$origin"

 fi
 
 cd "$D" || exit
 fi
 
 cd "$D" || exit

diff --git a/git-commit.sh b/git-commit.sh
index 22c4ce86c3cc5b35fab27bbe9e75dbe334f58534..08d786db2f3ea47503b798dec35d412cd9b22d4f 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -147,7 +147,7 @@ run_status () {
            git-ls-files -z --others $option \
                --exclude-per-directory=.gitignore
        fi |
            git-ls-files -z --others $option \
                --exclude-per-directory=.gitignore
        fi |

-       perl -e '$/ = "\0";
+       @@PERL@@ -e '$/ = "\0";

            my $shown = 0;
            while (<>) {
                chomp;
            my $shown = 0;
            while (<>) {
                chomp;

diff --git a/git-fetch.sh b/git-fetch.sh
index 48818f822451b3d69e7cd90e81e34bf137ead4dd..f80299daaaf782064d8892c65e774e1a0917658d 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -278,7 +278,7 @@ fetch_main () {
          head="ref: $remote_name"
          while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null
          do
          head="ref: $remote_name"
          while (expr "z$head" : "zref:" && expr $depth \< $max_depth) >/dev/null
          do

-           remote_name_quoted=$(perl -e '
+           remote_name_quoted=$(@@PERL@@ -e '

              my $u = $ARGV[0];
               $u =~ s/^ref:\s*//;
              $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
              my $u = $ARGV[0];
               $u =~ s/^ref:\s*//;
              $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;

diff --git a/git-rebase.sh b/git-rebase.sh
index 3945e067141ec1bc87456179a59de8f692bdf9fa..1b9e986926cf5b7d25afc6e0dc81ff9fc56c370a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -311,7 +311,7 @@ echo "$prev_head" > "$dotest/prev_head"
 
 msgnum=0
 for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
 
 msgnum=0
 for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \

-                       | perl -e 'print reverse <>'`
+                       | @@PERL@@ -e 'print reverse <>'`

 do
        msgnum=$(($msgnum + 1))
        echo "$cmt" > "$dotest/cmt.$msgnum"
 do
        msgnum=$(($msgnum + 1))
        echo "$cmt" > "$dotest/cmt.$msgnum"