[PATCH] instaweb: fix unportable ';' usage in sed
- From
- Eric Wong <normalperson@yhbt.net>
- Date
- Jul 2, 2006, 11:56 UTC
- Message-ID
- <20060702115616.GA28291@soma>
- In-Reply-To
- <Pine.LNX.4.63.0607021109540.29667@wbgn013.biozentrum.uni-wuerzburg.de>
Hint taken from Johannes. I've tested this with sed --posix on my system with GNU sed and it works fine with and also without it. Further portability testing/review would be good.
Signed-off-by: Eric Wong <normalperson@yhbt.net> ---
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote: > > Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> > --- > Re: What's in git.git > > On Sun, 2 Jul 2006, Junio C Hamano wrote: > > > - instaweb by Eric Wong. > > This breaks make on _all_ platforms I have. > > First of all, it is _ugly_ (three invocations of sed, where one > really is sufficient). Then, it uses the non-portable ';' > operator, and then, the non-at-all-portable 'T'. > > And worst: it is unnecessary.
*Blushes* Sorry about that, I've been meaning to brush up on my sed skills (coming from a Perl-heavy environment).
git-instaweb.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh index 51067d9..69aef3c 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -194,9 +194,9 @@ EOF } script=' -s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'`dirname $fqgitdir`'";#; -s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";#; -s#\(my\|our\) $projects_list =.*#\1 $projects_list = $projectroot;#; +s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'`dirname $fqgitdir`'";# +s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";# +s#\(my\|our\) $projects_list =.*#\1 $projects_list = $projectroot;# s#\(my\|our\) $git_temp =.*#\1 $git_temp = "'$fqgitdir/gitweb/tmp'";#' gitweb_cgi () {
-- 1.4.1.rc2.gbc4f