From: Jeff King Date: Thu, 22 May 2014 09:28:56 GMT Subject: [PATCH v2 2/8] t/lib-httpd: use write_script to copy CGI scripts Message-ID: <20140522092856.GB15032@sigill.intra.peff.net> In-Reply-To: <20140522092824.GA14530@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 --- 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