Re: [PATCH] Fix git-instaweb breakage on MacOS X due to the limited sed functionality
- From
Charles Bailey <charles@hashpling.org>
- Date
- Dec 19, 2007, 11:53 UTC
- Message-ID
- <20071219115319.GA29184@hashpling.org>
- In-Reply-To
- <20071219114823.GA28273@hashpling.org>
git-instaweb relied on a pipe in a sed script, but this is not supported by MacOS X sed when using BREs. git-instaweb relies on a working perl in any case, and perl re are more consistent between platforms, so replace sed invocation with an equivalent perl invocation.
Also, fix the documented -b "" to work without giving a spurious 'command not found' error.
Signed-off-by: Charles Bailey <charles@hashpling.org> --- Makefile | 1 + git-instaweb.sh | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile index 617e5f5..d6d3d65 100644 --- a/Makefile +++ b/Makefile @@ -880,6 +880,7 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css -e '/@@GITWEB_CGI@@/d' \ -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \ -e '/@@GITWEB_CSS@@/d' \ + -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ $@.sh > $@+ && \ chmod +x $@+ && \ mv $@+ $@ diff --git a/git-instaweb.sh b/git-instaweb.sh index 42d8d7f..9f86709 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -3,6 +3,7 @@ # Copyright (c) 2006 Eric Wong # +PERL='@@PERL@@' OPTIONS_KEEPDASHDASH= OPTIONS_SPEC="\ git-instaweb [options] (--start | --stop | --restart) @@ -232,16 +233,18 @@ 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\) $git_temp =.*#\1 $git_temp = "'$fqgitdir/gitweb/tmp'";#' +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 () { cat > "$1.tmp" <<\EOFGITWEB @@GITWEB_CGI@@ EOFGITWEB - sed "$script" "$1.tmp" > "$1" + # The generated scripts assume that perl is /usr/bin/perl + # so the assumption here should be no more harmful + "$PERL" -p -e "$script" "$1.tmp" > "$1" chmod +x "$1" rm -f "$1.tmp" } @@ -273,4 +276,4 @@ esac start_httpd url=http://127.0.0.1:$port -"$browser" $url || echo $url +test -n "$browser" && "$browser" $url || echo $url
-- 1.5.4.rc0