mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makefile: consistently use PERL_PATH

Browse Source 
When injecting the Perl path into our scripts we sometimes use '@PERL@'
while we othertimes use '@PERL_PATH@'. Refactor the code use the latter
consistently, which makes it easier to reuse the same logic for multiple
scripts.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-12-06 14:24:42 +01:00
committed by Junio C Hamano
parent a38edab7c8
commit c2a3b847ed
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -2554,7 +2554,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \ -e 's/@USE_GETTEXT_SCHEME@/$(USE_GETTEXT_SCHEME)/g' \
-e $(BROKEN_PATH_FIX) \ -e $(BROKEN_PATH_FIX) \
-e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \ -e 's|@GITWEBDIR@|$(gitwebdir_SQ)|g' \
-e 's|@PERL@|$(PERL_PATH_SQ)|g' \ -e 's|@PERL_PATH@|$(PERL_PATH_SQ)|g' \
-e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \ -e 's|@PAGER_ENV@|$(PAGER_ENV_SQ)|g' \
$@.sh >$@+ $@.sh >$@+
endef endef

2
contrib/buildsystems/CMakeLists.txt
View File

@ -846,7 +846,7 @@ foreach(script ${git_shell_scripts})
string(REPLACE "@NO_CURL@" "" content "${content}") string(REPLACE "@NO_CURL@" "" content "${content}")
string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}") string(REPLACE "@USE_GETTEXT_SCHEME@" "" content "${content}")
string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}") string(REPLACE "# @BROKEN_PATH_FIX@" "" content "${content}")
string(REPLACE "@PERL@" "${PERL_PATH}" content "${content}") string(REPLACE "@PERL_PATH@" "${PERL_PATH}" content "${content}")
string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}") string(REPLACE "@PAGER_ENV@" "LESS=FRX LV=-c" content "${content}")
file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content}) file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
endforeach() endforeach()

4
git-instaweb.sh
View File

@ -3,7 +3,7 @@
# Copyright (c) 2006 Eric Wong # Copyright (c) 2006 Eric Wong
# #
PERL='@PERL@' PERL='@PERL_PATH@'
OPTIONS_KEEPDASHDASH= OPTIONS_KEEPDASHDASH=
OPTIONS_STUCKLONG= OPTIONS_STUCKLONG=
OPTIONS_SPEC="\ OPTIONS_SPEC="\
@ -716,7 +716,7 @@ EOF
gitweb_conf() { gitweb_conf() {
cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF cat > "$fqgitdir/gitweb/gitweb_config.perl" <<EOF
#!@PERL@ #!@PERL_PATH@
our \$projectroot = "$(dirname "$fqgitdir")"; our \$projectroot = "$(dirname "$fqgitdir")";
our \$git_temp = "$fqgitdir/gitweb/tmp"; our \$git_temp = "$fqgitdir/gitweb/tmp";
our \$projects_list = \$projectroot; our \$projects_list = \$projectroot;

2
git-request-pull.sh
View File

@ -112,7 +112,7 @@ find_matching_ref='
} }
' '
set fnord $(git ls-remote "$url" | @PERL@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev") set fnord $(git ls-remote "$url" | @PERL_PATH@ -e "$find_matching_ref" "${remote:-HEAD}" "$headrev")
remote_sha1=$2 remote_sha1=$2
ref=$3 ref=$3