{"thread":{"id":"18465","subject":"[PATCH] documentation: Makefile accounts for SHELL_PATH setting","startedAt":"2009-03-22T13:20:44Z","lastAt":"2009-04-13T14:21:00Z","messageCount":10,"participants":["Ben Walton","Jeff King","Mike Hommey","Nanako Shiraishi","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"108895","messageId":"1237728044-15651-1-git-send-email-bwalton@artsci.utoronto.ca","threadId":"18465","inReplyTo":null,"subject":"[PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-03-22T13:20:44Z","receivedAt":"2009-03-22T13:20:44Z","isPatch":true,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Ensure that the Makefile that generates and installs the Documentation\nis aware of any SHELL_PATH setting. Use this value if found or the\ncurrent setting for SHELL if not. This is an accommodation for systems\nwhere sh is not bash.\n\nSigned-off-by: Ben Walton \n---\n Documentation/Makefile | 16 ++++++++++------\n 1 files changed, 10 insertions(+), 6 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 144ec32..0353690 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -67,6 +67,10 @@ ASCIIDOC_EXTRA += -a docbook-xsl-172\n MANPAGE_XSL = manpage-1.72.xsl\n endif\n \n+SHELL_PATH ?= $(SHELL)\n+# Shell quote;\n+SHELL_PATH_SQ = $(subst ','\\'',$(SHELL_PATH))\n+\n #\n # Please note that there is a minor bug in asciidoc.\n # The version after 6.0.3 _will_ include the patch found here:\n@@ -116,7 +120,7 @@ install-pdf: pdf\n \t$(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)\n \n install-html: html\n-\tsh ./install-webdoc.sh $(DESTDIR)$(htmldir)\n+\t'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(DESTDIR)$(htmldir)\n \n ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE\n \t$(MAKE) -C ../ GIT-VERSION-FILE\n@@ -178,7 +182,7 @@ user-manual.xml: user-manual.txt user-manual.conf\n \n technical/api-index.txt: technical/api-index-skel.txt \\\n \ttechnical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))\n-\tcd technical && sh ./api-index.sh\n+\tcd technical && '$(SHELL_PATH_SQ)' ./api-index.sh\n \n $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt\n \t$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \\\n@@ -220,7 +224,7 @@ $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml\n \n howto-index.txt: howto-index.sh $(wildcard howto/*.txt)\n \t$(RM) $@+ $@\n-\tsh ./howto-index.sh $(wildcard howto/*.txt) >$@+\n+\t'$(SHELL_PATH_SQ)' ./howto-index.sh $(wildcard howto/*.txt) >$@+\n \tmv $@+ $@\n \n $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt\n@@ -234,14 +238,14 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt\n \tmv $@+ $@\n \n install-webdoc : html\n-\tsh ./install-webdoc.sh $(WEBDOC_DEST)\n+\t'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)\n \n quick-install: quick-install-man\n \n quick-install-man:\n-\tsh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)\n+\t'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)\n \n quick-install-html:\n-\tsh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)\n+\t'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)\n \n .PHONY: .FORCE-GIT-VERSION-FILE\n-- \n1.6.0.4\n"},{"id":"109004","messageId":"20090323065710.GA7048@coredump.intra.peff.net","threadId":"18465","inReplyTo":"1237728044-15651-1-git-send-email-bwalton@artsci.utoronto.ca","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-23T06:57:10Z","receivedAt":"2009-03-23T06:57:10Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sun, Mar 22, 2009 at 09:20:44AM -0400, Ben Walton wrote:\n\n> Ensure that the Makefile that generates and installs the Documentation\n> is aware of any SHELL_PATH setting. Use this value if found or the\n> current setting for SHELL if not. This is an accommodation for systems\n> where sh is not bash.\n\nNit: I have lots of systems where sh is not bash, and they work fine. It\nis really about \"where sh is not horribly broken\". There aren't (AFAIK)\nand should not be any bash-isms in these scripts.\n\nThe patch itself looks fine; thanks for addressing my concerns.\n\n-Peff\n"},{"id":"109056","messageId":"1237812904-sup-3864@ntdws12.chass.utoronto.ca","threadId":"18465","inReplyTo":"20090323065710.GA7048@coredump.intra.peff.net","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-03-23T12:57:27Z","receivedAt":"2009-03-23T12:57:27Z","isPatch":true,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Excerpts from Jeff King's message of Mon Mar 23 02:57:10 -0400 2009:\n> Nit: I have lots of systems where sh is not bash, and they work fine. It\n> is really about \"where sh is not horribly broken\". There aren't (AFAIK)\n> and should not be any bash-isms in these scripts.\n\nThat's a fair point. I've been lugging this around for a bit in the\nbuild tree I use, so I don't recall specifically what was breaking.\nThe sh in question is the one found in solaris 8. When I get a few\nmintues, I'll build without the patch to see what the problem was...\n\n> The patch itself looks fine; thanks for addressing my concerns.\n\nThanks for the helpful feedback! :)\n\n-Ben\n-- \nBen Walton\nSystems Programmer - CHASS\nUniversity of Toronto\nC:416.407.5610 | W:416.978.4302\n\nGPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu\nContact me to arrange for a CAcert assurance meeting.\n"},{"id":"109061","messageId":"20090323140302.GA11005@coredump.intra.peff.net","threadId":"18465","inReplyTo":"1237812904-sup-3864@ntdws12.chass.utoronto.ca","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-03-23T14:03:02Z","receivedAt":"2009-03-23T14:03:02Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Mar 23, 2009 at 08:57:27AM -0400, Ben Walton wrote:\n\n> That's a fair point. I've been lugging this around for a bit in the\n> build tree I use, so I don't recall specifically what was breaking.\n> The sh in question is the one found in solaris 8. When I get a few\n> mintues, I'll build without the patch to see what the problem was...\n\nI wouldn't worry about it. The /bin/sh on Solaris 8 is pretty hopelessly\nbroken for our use. At the very least it doesn't understand $()\nsubsititution.\n\n-Peff\n"},{"id":"109066","messageId":"20090323141238.GA14722@glandium.org","threadId":"18465","inReplyTo":"20090323140302.GA11005@coredump.intra.peff.net","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Mike Hommey","fromEmail":"mh@glandium.org","sentAt":"2009-03-23T14:12:39Z","receivedAt":"2009-03-23T14:12:39Z","isPatch":true,"sender":{"key":"mh@glandium.org","avatar":"https://avatars.githubusercontent.com/u/1038527?v=4"},"body":"On Mon, Mar 23, 2009 at 10:03:02AM -0400, Jeff King wrote:\n> On Mon, Mar 23, 2009 at 08:57:27AM -0400, Ben Walton wrote:\n> \n> > That's a fair point. I've been lugging this around for a bit in the\n> > build tree I use, so I don't recall specifically what was breaking.\n> > The sh in question is the one found in solaris 8. When I get a few\n> > mintues, I'll build without the patch to see what the problem was...\n> \n> I wouldn't worry about it. The /bin/sh on Solaris 8 is pretty hopelessly\n> broken for our use. At the very least it doesn't understand $()\n> subsititution.\n\nNeither does it on solaris 10. Fortunately, there is /usr/xpg4/bin/sh.\n\nMike\n"},{"id":"110972","messageId":"20090410093430.6117@nanako3.lavabit.com","threadId":"18465","inReplyTo":"1237728044-15651-1-git-send-email-bwalton@artsci.utoronto.ca","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2009-04-10T00:34:30Z","receivedAt":"2009-04-10T00:34:30Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Quoting Ben Walton:\n\n> Ensure that the Makefile that generates and installs the Documentation\n> is aware of any SHELL_PATH setting. Use this value if found or the\n> current setting for SHELL if not. This is an accommodation for systems\n> where sh is not bash.\n>\n> Signed-off-by: Ben Walton \n\nJunio, may I ask what happened to this patch?\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"111094","messageId":"7vmyamdirk.fsf@gitster.siamese.dyndns.org","threadId":"18465","inReplyTo":"20090410093430.6117@nanako3.lavabit.com","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-11T20:42:39Z","receivedAt":"2009-04-11T20:42:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Nanako Shiraishi writes:\n\n> Quoting Ben Walton:\n>\n>> Ensure that the Makefile that generates and installs the Documentation\n>> is aware of any SHELL_PATH setting. Use this value if found or the\n>> current setting for SHELL if not. This is an accommodation for systems\n>> where sh is not bash.\n>>\n>> Signed-off-by: Ben Walton \n>\n> Junio, may I ask what happened to this patch?\n\nThere was a discussion going that eventurally petered out without seeing\nsuccess (or breakage) reports from people with various platforms.\n\nI think the patch text is Ok, with \"where sh is not bash\" in the log\nmessage rephrased to \"where sh is not POSIX\", but I do not have an easy\naccess to a system where /bin/sh is broken (perhaps I should install\nOpenSolaris in a vbox to try out), so it is still sitting in my inbox.\n"},{"id":"111111","messageId":"1239500938-sup-5545@ntdws12.chass.utoronto.ca","threadId":"18465","inReplyTo":"7vmyamdirk.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-04-12T01:49:25Z","receivedAt":"2009-04-12T01:49:25Z","isPatch":true,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Excerpts from Junio C Hamano's message of Sat Apr 11 16:42:39 -0400 2009:\n> There was a discussion going that eventurally petered out without seeing\n> success (or breakage) reports from people with various platforms.\n\nI didn't see that part of the discussion. Were there breakage\nreports? I'm willing to make any required corrections to the patch\nsuch that it gets included (then I could drop it locally).\n\n> I think the patch text is Ok, with \"where sh is not bash\" in the log\n> message rephrased to \"where sh is not POSIX\", but I do not have an\n> easy\n\nI'll resubmit with the wording correction and any other requested\nalterations.\n\nThanks\n-Ben\n-- \nBen Walton\nSystems Programmer - CHASS\nUniversity of Toronto\nC:416.407.5610 | W:416.978.4302\n\nGPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu\nContact me to arrange for a CAcert assurance meeting.\n"},{"id":"111121","messageId":"7vzlem9sxu.fsf@gitster.siamese.dyndns.org","threadId":"18465","inReplyTo":"1239500938-sup-5545@ntdws12.chass.utoronto.ca","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-12T08:28:45Z","receivedAt":"2009-04-12T08:28:45Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ben Walton writes:\n\n> Excerpts from Junio C Hamano's message of Sat Apr 11 16:42:39 -0400 2009:\n>> There was a discussion going that eventurally petered out without seeing\n>> success (or breakage) reports from people with various platforms.\n>\n> I didn't see that part of the discussion. Were there breakage\n> reports? I'm willing to make any required corrections to the patch\n> such that it gets included (then I could drop it locally).\n\nI do not recall breakage reports nor success reports. At least it does\nnot seem to break things for me, but I do not do anything so...\n"},{"id":"111191","messageId":"1239632383-sup-5048@ntdws12.chass.utoronto.ca","threadId":"18465","inReplyTo":"7vzlem9sxu.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] documentation: Makefile accounts for SHELL_PATH setting","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-04-13T14:21:00Z","receivedAt":"2009-04-13T14:21:00Z","isPatch":true,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Excerpts from Junio C Hamano's message of Sun Apr 12 04:28:45 -0400 2009:\n> I do not recall breakage reports nor success reports. At least it does\n> not seem to break things for me, but I do not do anything so...\n\nOk. I see that you've applied the patch to 'next' already (with\nmodified patch text), so I won't re-submit unless someone points out a\nbreakage that the change introduced.\n\nThanks\n-Ben\n-- \nBen Walton\nSystems Programmer - CHASS\nUniversity of Toronto\nC:416.407.5610 | W:416.978.4302\n\nGPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu\nContact me to arrange for a CAcert assurance meeting.\n"}]}