git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Jack Olrik <david@olrik.dk>
To: git@vger.kernel.org
Cc: ukleinek@informatik.uni-freiburg.de, David Jack Olrik <david@olrik.dk>
Subject: [PATCH] Fixed non portable use of expr and removed incorrect use of test -eq for string comparison
Date: Wed, 22 Aug 2007 22:18:30 +0200	[thread overview]
Message-ID: <11878139102715-git-send-email-david@olrik.dk> (raw)
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

  reply	other threads:[~2007-08-22 20:18 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-22 12:02 [PATCH] Fixed non portable use of expr, and incorrect use of test -eq for string comparison David Jack Olrik
2007-08-22 12:21 ` Uwe Kleine-König
2007-08-22 12:30   ` David Jack Olrik
2007-08-22 13:23     ` Uwe Kleine-König
2007-08-22 20:18       ` David Jack Olrik [this message]
2007-08-22 21:56         ` [PATCH] Fixed non portable use of expr and removed " Junio C Hamano
2007-08-23  9:06           ` Uwe Kleine-König
2007-08-23  9:25             ` Junio C Hamano
2007-08-23 10:02               ` Uwe Kleine-König
2007-08-23  8:58         ` Uwe Kleine-König
2007-08-22 21:00 ` [PATCH] Fixed non portable use of expr, and " martin f krafft

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=11878139102715-git-send-email-david@olrik.dk \
    --to=david@olrik.dk \
    --cc=git@vger.kernel.org \
    --cc=ukleinek@informatik.uni-freiburg.de \
    /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).