From: Jonathan Nieder <jrnieder@gmail.com>
To: Johannes Sixt <j6t@kdbg.org>
Cc: Dan Jacques <dnj@google.com>, Junio C Hamano <gitster@pobox.com>,
Johannes.Schindelin@gmx.de, avarab@gmail.com,
git@vger.kernel.org, Brandon Williams <bmwill@google.com>
Subject: [PATCH 2/2] Makefile: quote $INSTLIBDIR when passing it to sed
Date: Mon, 23 Apr 2018 16:25:35 -0700 [thread overview]
Message-ID: <20180423232535.GD25128@aiede.svl.corp.google.com> (raw)
In-Reply-To: <20180423232326.GB25128@aiede.svl.corp.google.com>
f6a0ad4b (Makefile: generate Perl header from template file,
2018-04-10) moved code for generating the 'use lib' lines at the top
of perl scripts from the $(SCRIPT_PERL_GEN) rule to a separate
GIT-PERL-HEADER rule.
This rule first populates INSTLIBDIR and then substitutes it into the
GIT-PERL-HEADER using sed:
INSTLIBDIR=... something ...
sed -e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' $< > $@
Because $INSTLIBDIR is not surrounded by double quotes, the shell
splits it at each space, causing errors if INSTLIBDIR contains an $IFS
character:
sed: 1: "s=@@INSTLIBDIR@@=/usr/l ...": unescaped newline inside substitute pattern
Add back the missing double-quotes to make it work again.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Thanks for reading.
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 8f4cb506ff..727eca5d0a 100644
--- a/Makefile
+++ b/Makefile
@@ -2108,7 +2108,7 @@ GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
sed -e 's=@@PATHSEP@@=$(pathsep)=g' \
- -e 's=@@INSTLIBDIR@@='$$INSTLIBDIR'=g' \
+ -e 's=@@INSTLIBDIR@@='"$$INSTLIBDIR"'=g' \
-e 's=@@PERLLIBDIR_REL@@=$(perllibdir_relative_SQ)=g' \
-e 's=@@GITEXECDIR_REL@@=$(gitexecdir_relative_SQ)=g' \
-e 's=@@LOCALEDIR_REL@@=$(localedir_relative_SQ)=g' \
--
2.17.0.441.gb46fe60e1d
next prev parent reply other threads:[~2018-04-23 23:25 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-29 15:56 [PATCH v4 0/4] RUNTIME_PREFIX relocatable Git Dan Jacques
2017-11-29 15:56 ` [PATCH v4 1/4] Makefile: generate Perl header from template file Dan Jacques
2017-12-01 16:59 ` Johannes Sixt
2017-12-01 17:13 ` Johannes Schindelin
2017-12-01 17:25 ` Johannes Sixt
2017-12-01 18:18 ` Dan Jacques
2017-12-01 18:52 ` Andreas Schwab
2017-12-05 20:54 ` Johannes Sixt
2017-12-05 21:17 ` Junio C Hamano
2017-12-05 21:26 ` Dan Jacques
2017-12-05 21:35 ` Junio C Hamano
2017-12-06 18:25 ` Johannes Sixt
2017-12-06 18:47 ` Junio C Hamano
2017-12-06 18:56 ` Daniel Jacques
2017-12-06 19:01 ` Ævar Arnfjörð Bjarmason
2017-12-08 21:15 ` Ævar Arnfjörð Bjarmason
2018-04-23 23:23 ` [PATCH dj/runtime-prefix 0/2] Handle $IFS in $INSTLIBDIR Jonathan Nieder
2018-04-23 23:24 ` [PATCH 1/2] Makefile: remove unused @@PERLLIBDIR@@ substitution variable Jonathan Nieder
2018-04-24 2:11 ` Junio C Hamano
2018-04-23 23:25 ` Jonathan Nieder [this message]
2018-04-24 0:53 ` [PATCH 2/2] Makefile: quote $INSTLIBDIR when passing it to sed Junio C Hamano
2018-04-24 2:18 ` [PATCH 2/2 v2] " Jonathan Nieder
2018-04-24 2:56 ` Daniel Jacques
2017-12-03 5:26 ` [PATCH v4 1/4] Makefile: generate Perl header from template file Junio C Hamano
2017-12-03 9:26 ` Ævar Arnfjörð Bjarmason
2017-11-29 15:56 ` [PATCH v4 2/4] Makefile: add support for "perllibdir" Dan Jacques
2017-11-29 20:04 ` Ævar Arnfjörð Bjarmason
2017-11-29 15:56 ` [PATCH v4 3/4] Makefile: add Perl runtime prefix support Dan Jacques
2017-11-29 21:00 ` Ævar Arnfjörð Bjarmason
2017-12-02 15:47 ` [PATCH v4 3/4] RUNTIME_PREFIX relocatable Git Dan Jacques
2017-11-29 21:04 ` [PATCH v4 3/4] Makefile: add Perl runtime prefix support Ævar Arnfjörð Bjarmason
2017-11-29 15:56 ` [PATCH v4 4/4] exec_cmd: RUNTIME_PREFIX on some POSIX systems Dan Jacques
2017-11-29 21:12 ` [PATCH v4 0/4] RUNTIME_PREFIX relocatable Git Ævar Arnfjörð Bjarmason
2017-11-29 22:38 ` Dan Jacques
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180423232535.GD25128@aiede.svl.corp.google.com \
--to=jrnieder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=bmwill@google.com \
--cc=dnj@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).