From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2] Do not install shell libraries executable
Date: Sun, 31 Jan 2010 14:00:28 -0600 [thread overview]
Message-ID: <20100131200028.GA4045@progeny.tock> (raw)
In-Reply-To: <7vy6jecb0y.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> How much would it hurt the distro packagers, if we don't take this patch
> before 1.7.0? If this would help a lot, let's give it a bit higher
> priority and make sure 1.7.0 ships with (a corrected version of) it;
> otherwise I'd say we should not merge this before 1.7.0.
Given that Peff’s fix is in, I don’t think it is needed at all. So I
would say, better to let it wait.
> > +SCRIPT_LIB_SH += git-mergetool--lib.sh
> > +SCRIPT_LIB_SH += git-parse-remote.sh
> > +SCRIPT_LIB_SH += git-sh-setup.sh
> > + ...
> > @@ -1792,6 +1802,7 @@ install: all
> > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
> > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
> > $(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
> > + $(INSTALL) -m 644 $(SCRIPT_LIB_SH) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
>
> I can understand that you didn't want to include the "included scriptlets"
> as part of ALL_PROGRAMS because $(INSTALL) may flip 'x' bit on.
>
> But you should then be installing %(patsubst %.sh,%,$(SCRIPT_LIB_SH));
> otherwise, you are installing git-sh-setup.sh and
>
> . git-sh-setup
>
> would not work. Have you ever tested this?
Good catches, sorry. :( I did test but clearly I was not thinking very
well when I looked at the result...
> Wouldn't it make a bit more sense to do it like this instead?
Yes, that looks right. Thanks for cleaning up my mess!
Sorry for the trouble,
Jonathan
next prev parent reply other threads:[~2010-01-31 20:00 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-28 14:52 [PATCH] rerere: fix too-short initialization Jeff King
2010-01-29 10:25 ` [PATCH 0/3] valgrind bug roundup Jeff King
2010-01-29 10:28 ` [PATCH 1/3] fix memcpy of overlapping area Jeff King
2010-01-29 10:31 ` [PATCH 2/3] fix off-by-one allocation error Jeff King
2010-01-29 10:37 ` [PATCH 3/3] add shebang line to git-mergetool--lib.sh Jeff King
2010-01-29 14:50 ` [PATCH] Do not install shell libraries executable Jonathan Nieder
2010-01-31 7:08 ` Junio C Hamano
2010-01-31 8:34 ` [PATCH v2] " Jonathan Nieder
2010-01-31 19:46 ` Junio C Hamano
2010-01-31 20:00 ` Jonathan Nieder [this message]
2010-01-31 20:05 ` Junio C Hamano
2010-01-31 21:00 ` Jonathan Nieder
2010-01-31 21:08 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100131200028.GA4045@progeny.tock \
--to=jrnieder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/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.
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 NNTP newsgroup(s).