From: Naohiro Aota <naota@elisp.net>
To: git@vger.kernel.org
Cc: gitster@pobox.com, tarmigan+git@gmail.com
Subject: [PATCH] shell portability: Use sed instead of non-portable variable expansion
Date: Mon, 05 Sep 2011 14:11:47 +0900 [thread overview]
Message-ID: <8762l73758.fsf@elisp.net> (raw)
Variable expansions like "${foo#bar}" or "${foo%bar}" doesn't work on
shells like FreeBSD sh and they made the test to fail. This patch
replace such variable expansions with sed.
Signed-off-by: Naohiro Aota <naota@elisp.net>
---
Testing on FreeBSD failed because of this "bash-ism". After applying
this patch, I've verified the test to pass on FreeBSD. (and it worked
well also with GNU sed)
t/t5560-http-backend-noserver.sh | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 0ad7ce0..c8237ef 100755
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -9,8 +9,8 @@ test_have_prereq MINGW && export GREP_OPTIONS=-U
run_backend() {
echo "$2" |
- QUERY_STRING="${1#*\?}" \
- PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/${1%%\?*}" \
+ QUERY_STRING=$(echo "$1"|sed -e 's/^[^?]*?\(.*\)$/\1/') \
+ PATH_TRANSLATED="$HTTPD_DOCUMENT_ROOT_PATH/$(echo "$1"|sed -e 's/^\([^?]*\)?.*$/\1/')" \
git http-backend >act.out 2>act.err
}
--
1.7.6
next reply other threads:[~2011-09-05 5:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-05 5:11 Naohiro Aota [this message]
2011-09-05 7:03 ` [PATCH] shell portability: Use sed instead of non-portable variable expansion Johannes Sixt
2011-09-05 7:15 ` Junio C Hamano
2011-09-05 7:35 ` Johannes Sixt
2011-09-05 7:45 ` Junio C Hamano
2011-09-05 8:16 ` Johannes Sixt
2011-09-05 8:21 ` Johannes Sixt
2011-09-05 7:55 ` Naohiro Aota
2011-09-05 7:09 ` Junio C Hamano
2011-09-05 7:54 ` Johannes Sixt
2011-09-05 8:11 ` Junio C Hamano
2011-09-05 8:22 ` Junio C Hamano
2011-09-06 19:09 ` [PATCH] Makefile: abort on shells that do not support ${parameter%word} expansion Brandon Casey
2011-09-06 19:32 ` Brandon Casey
2011-09-06 20:30 ` Brandon Casey
2011-09-06 20:01 ` Junio C Hamano
2011-09-06 20:09 ` Brandon Casey
2011-09-06 20:03 ` Junio C Hamano
2011-09-06 20:20 ` Brandon Casey
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=8762l73758.fsf@elisp.net \
--to=naota@elisp.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tarmigan+git@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).