undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix git-instaweb breakage on MacOS X due to the limited sed functionality

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Charles Bailey 2007-12-19 12:25:27 +00:00 committed by Junio C Hamano
parent ecaa0cff44
commit c569969363
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -880,6 +880,7 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/gitweb.css
-e '/@@GITWEB_CGI@@/d' \ -e '/@@GITWEB_CGI@@/d' \
-e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \ -e '/@@GITWEB_CSS@@/r gitweb/gitweb.css' \
-e '/@@GITWEB_CSS@@/d' \ -e '/@@GITWEB_CSS@@/d' \
-e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \
$@.sh > $@+ && \ $@.sh > $@+ && \
chmod +x $@+ && \ chmod +x $@+ && \
mv $@+ $@ mv $@+ $@

15
git-instaweb.sh
View File

@ -3,6 +3,7 @@
# Copyright (c) 2006 Eric Wong # Copyright (c) 2006 Eric Wong
# #
PERL='@@PERL@@'
OPTIONS_KEEPDASHDASH= OPTIONS_KEEPDASHDASH=
OPTIONS_SPEC="\ OPTIONS_SPEC="\
git-instaweb [options] (--start | --stop | --restart) git-instaweb [options] (--start | --stop | --restart)
@ -232,16 +233,18 @@ EOF
} }
script=' script='
s#^\(my\|our\) $projectroot =.*#\1 $projectroot = "'$(dirname "$fqgitdir")'";# s#^(my|our) \$projectroot =.*#$1 \$projectroot = "'$(dirname "$fqgitdir")'";#;
s#\(my\|our\) $gitbin =.*#\1 $gitbin = "'$GIT_EXEC_PATH'";# s#(my|our) \$gitbin =.*#$1 \$gitbin = "'$GIT_EXEC_PATH'";#;
s#\(my\|our\) $projects_list =.*#\1 $projects_list = $projectroot;# s#(my|our) \$projects_list =.*#$1 \$projects_list = \$projectroot;#;
s#\(my\|our\) $git_temp =.*#\1 $git_temp = "'$fqgitdir/gitweb/tmp'";#' s#(my|our) \$git_temp =.*#$1 \$git_temp = "'$fqgitdir/gitweb/tmp'";#;'
gitweb_cgi () { gitweb_cgi () {
cat > "$1.tmp" <<\EOFGITWEB cat > "$1.tmp" <<\EOFGITWEB
@@GITWEB_CGI@@ @@GITWEB_CGI@@
EOFGITWEB EOFGITWEB
sed "$script" "$1.tmp" > "$1" # Use the configured full path to perl to match the generated
# scripts' 'hashpling' line
"$PERL" -p -e "$script" "$1.tmp" > "$1"
chmod +x "$1" chmod +x "$1"
rm -f "$1.tmp" rm -f "$1.tmp"
} }
@ -273,4 +276,4 @@ esac
start_httpd start_httpd
url=http://127.0.0.1:$port url=http://127.0.0.1:$port
"$browser" $url || echo $url test -n "$browser" && "$browser" $url || echo $url