From: Jakub Narebski Date: Sat, 22 May 2010 18:59:54 GMT Subject: Re: [PATCHv2 GSoC] git-instaweb: Configure it to work with new gitweb structure Message-ID: <201005222059.54995.jnareb@gmail.com> In-Reply-To: On Sat, 22 May 2010, Pavan Kumar Sunkara wrote: > 2010/5/22 Jakub Narebski : >> On Sat, 22 May 2010, Pavan Kumar Sunkara wrote: >> Acked-by: Jakub Narebski >> >> _If_ there is no problem with $(gitwebdir) and not $(gitwebdir_SQ), >> see below for details. [...] >>> diff --git a/Makefile b/Makefile >>> index caf2f64..91cd726 100644 >>> --- a/Makefile >>> +++ b/Makefile >>> @@ -1592,15 +1592,8 @@ git-instaweb: git-instaweb.sh gitweb/gitweb.cgi gitweb/static/gitweb.css gitweb/ >>>       sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ >> [...] >>> +         -e 's|@@GITWEBDIR@@|$(gitwebdir)|g' \ >>>           -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \ >>> -            -e 's|@@GITWEB_CSS_NAME@@|$(GITWEB_CSS)|' \ >>> -            -e 's|@@GITWEB_JS_NAME@@|$(GITWEB_JS)|' \ >>>           $@.sh> $@+ && \ >>>       chmod +x $@+ && \ >>>       mv $@+ $@ >>> @@ -1972,6 +1965,7 @@ install: all >>>       $(MAKE) -C templates DESTDIR='$(DESTDIR_SQ)' install >>>  ifndef NO_PERL >>>       $(MAKE) -C perl prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' install >>> +     $(MAKE) -C gitweb gitwebdir=$(gitwebdir) install >>>  endif >> >> Have you checked that you can use $(gitwebdir) and don't need >> $(gitwebdir_SQ) here?  Does git-instaweb installs and works correctly >> if 'gitwebdir' contains spaces and single or double quote characters? >> But perhaps that doesn't matter in practice, and this is good enough. > > Nope. I didn't check it. But you are right. Does it mean that after your patch git-instaweb works correctly if 'gitwebdir' is set to something like (for example): gitwebdir="/home/local/some strange \"path'" -- Jakub Narebski Poland