[PATCH] Fixed non portable use of expr and removed incorrect use of test -eq for string comparison
- From
David Jack Olrik <david@olrik.dk>
- Date
- Aug 22, 2007, 20:18 UTC
- Message-ID
- <11878139102715-git-send-email-david@olrik.dk>
- In-Reply-To
- <20070822132359.GA13750@informatik.uni-freiburg.de>
On 22/08/2007, at 15.23, Uwe Kleine-König wrote:
> > You'd then need to check against 2 instead of 1, which I find less > > obvious as we are testing for a '/' at the begining of the string. > If I understood the problem right you only need to test for the exit > code, that is the program test is not required at all.
Ah, yes that's true. The following should make it more clear that we are looking at the first character.
if expr "$httpd_only" : "\/" >/dev/null
Signed-off-by: David Jack Olrik <david@olrik.dk> --- git-instaweb.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh index b79c6b6..85646f1 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -30,7 +30,7 @@ test -z "$port" && port=1234 start_httpd () { httpd_only="`echo $httpd | cut -f1 -d' '`" - if test "`expr index $httpd_only /`" -eq '1' || \ + if expr "$httpd_only" : "\/" >/dev/null || \ which $httpd_only >/dev/null then $httpd $fqgitdir/gitweb/httpd.conf
-- 1.5.3.rc6