Skip to content

Commit 219ea0e

Browse files
committed
Merge branch 'jk/replace-perl-in-built-scripts'
* jk/replace-perl-in-built-scripts: use @@Perl@@ in built scripts
2 parents 86cd8dc + fcb06a8 commit 219ea0e

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

git-am.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ split_patches () {
302302
# not starting with Author, From or Date is the
303303
# subject, and the body starts with the next nonempty
304304
# line not starting with Author, From or Date
305-
perl -ne 'BEGIN { $subject = 0 }
305+
@@PERL@@ -ne 'BEGIN { $subject = 0 }
306306
if ($subject > 1) { print ; }
307307
elsif (/^\s+$/) { next ; }
308308
elsif (/^Author:/) { s/Author/From/ ; print ;}
@@ -334,7 +334,7 @@ split_patches () {
334334
# Since we cannot guarantee that the commit message is in
335335
# git-friendly format, we put no Subject: line and just consume
336336
# all of the message as the body
337-
LANG=C LC_ALL=C perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
337+
LANG=C LC_ALL=C @@PERL@@ -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 }
338338
if ($subject) { print ; }
339339
elsif (/^\# User /) { s/\# User/From:/ ; print ; }
340340
elsif (/^\# Date /) {

git-instaweb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ EOF
581581

582582
gitweb_conf() {
583583
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
584-
#!/usr/bin/perl
584+
#!@@PERL@@
585585
our \$projectroot = "$(dirname "$fqgitdir")";
586586
our \$git_temp = "$fqgitdir/gitweb/tmp";
587587
our \$projects_list = \$projectroot;

git-request-pull.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ find_matching_ref='
106106
}
107107
'
108108

109-
ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
109+
ref=$(git ls-remote "$url" | @@PERL@@ -e "$find_matching_ref" "$head" "$headrev" "$tag_name")
110110

111111
url=$(git ls-remote --get-url "$url")
112112

git-submodule.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ module_list()
156156
git ls-files -z --error-unmatch --stage -- "$@" ||
157157
echo "unmatched pathspec exists"
158158
) |
159-
perl -e '
159+
@@PERL@@ -e '
160160
my %unmerged = ();
161161
my ($null_sha1) = ("0" x 40);
162162
my @out = ();

0 commit comments

Comments
 (0)