From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: "Kyle J. McKay" <mackyle@gmail.com>
Subject: [PATCH 5/9] t/lib-httpd: use write_script to copy CGI scripts
Date: Wed, 21 May 2014 06:29:42 -0400 [thread overview]
Message-ID: <20140521102941.GE30464@sigill.intra.peff.net> (raw)
In-Reply-To: <20140521102524.GA30301@sigill.intra.peff.net>
Using write_script will set our shebang line appropriately
with $SHELL_PATH. The script that is there now is quite
simple and likely to succeed even with a non-POSIX /bin/sh,
but it does not hurt to be defensive.
Signed-off-by: Jeff King <peff@peff.net>
---
t/lib-httpd.sh | 6 +++++-
t/lib-httpd/broken-smart-http.sh | 1 -
2 files changed, 5 insertions(+), 2 deletions(-)
mode change 100755 => 100644 t/lib-httpd/broken-smart-http.sh
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 252cbf1..8e680ef 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -105,10 +105,14 @@ else
"Could not identify web server at '$LIB_HTTPD_PATH'"
fi
+install_script () {
+ write_script "$HTTPD_ROOT_PATH/$1" <"$TEST_PATH/$1"
+}
+
prepare_httpd() {
mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH"
- cp "$TEST_PATH"/broken-smart-http.sh "$HTTPD_ROOT_PATH"
+ install_script broken-smart-http.sh
ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
diff --git a/t/lib-httpd/broken-smart-http.sh b/t/lib-httpd/broken-smart-http.sh
old mode 100755
new mode 100644
index f7ebfff..82cc610
--- a/t/lib-httpd/broken-smart-http.sh
+++ b/t/lib-httpd/broken-smart-http.sh
@@ -1,4 +1,3 @@
-#!/bin/sh
printf "Content-Type: text/%s\n" "html"
echo
printf "%s\n" "001e# service=git-upload-pack"
--
2.0.0.rc1.436.g03cb729
next prev parent reply other threads:[~2014-05-21 10:29 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-21 10:25 [PATCH 0/9] handle alternate charsets for remote http errors Jeff King
2014-05-21 10:27 ` [PATCH 1/9] test-lib: preserve GIT_CURL_VERBOSE from the environment Jeff King
2014-05-21 10:27 ` [PATCH 2/9] strbuf: add strbuf_tolower function Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 5:58 ` Jeff King
2014-05-22 18:36 ` Junio C Hamano
2014-05-22 18:41 ` Jeff King
2014-05-22 21:04 ` Junio C Hamano
2014-05-23 20:03 ` Jeff King
2014-05-22 22:52 ` Kyle J. McKay
2014-05-23 20:05 ` Jeff King
2014-05-23 22:34 ` Kyle J. McKay
2014-05-21 10:28 ` [PATCH 3/9] daemon/config: factor out duplicate xstrdup_tolower Jeff King
2014-05-21 10:29 ` [PATCH 4/9] http: normalize case of returned content-type Jeff King
2014-05-21 10:29 ` Jeff King [this message]
2014-05-21 10:29 ` [PATCH 6/9] t5550: test display of remote http error messages Jeff King
2014-05-21 10:33 ` [PATCH 7/9] remote-curl: recognize text/plain with a charset parameter Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 6:05 ` Jeff King
2014-05-22 7:27 ` Kyle J. McKay
2014-05-22 9:02 ` Jeff King
2014-05-22 7:12 ` Peter Krefting
2014-05-22 9:05 ` Jeff King
2014-05-22 10:19 ` Peter Krefting
2014-05-21 10:33 ` [PATCH 8/9] strbuf: add strbuf_reencode helper Jeff King
2014-05-21 10:33 ` [PATCH 9/9] remote-curl: reencode http error messages Jeff King
2014-05-22 0:07 ` Kyle J. McKay
2014-05-22 6:05 ` Jeff King
2014-05-22 7:26 ` Peter Krefting
2014-05-22 9:28 ` [PATCH v2 0/9] handle alternate charsets for remote http errors Jeff King
2014-05-22 9:28 ` [PATCH v2 1/8] test-lib: preserve GIT_CURL_VERBOSE from the environment Jeff King
2014-05-22 9:28 ` [PATCH v2 2/8] t/lib-httpd: use write_script to copy CGI scripts Jeff King
2014-05-22 9:29 ` [PATCH v2 3/8] t5550: test display of remote http error messages Jeff King
2014-05-22 9:29 ` [PATCH v2 4/8] http: extract type/subtype portion of content-type Jeff King
2014-05-22 22:52 ` Kyle J. McKay
2014-05-23 20:12 ` Jeff King
2014-05-23 22:00 ` Kyle J. McKay
2014-05-22 9:30 ` [PATCH v2 5/8] http: optionally extract charset parameter from content-type Jeff King
2014-05-22 9:30 ` [PATCH v2 6/8] strbuf: add strbuf_reencode helper Jeff King
2014-05-22 9:30 ` [PATCH v2 7/8] remote-curl: reencode http error messages Jeff King
2014-05-22 9:36 ` [PATCH v2 8/8] http: default text charset to iso-8859-1 Jeff King
2014-05-23 2:02 ` brian m. carlson
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=20140521102941.GE30464@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mackyle@gmail.com \
/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).