[PATCH 4/6] git-instaweb: unconditionally assume that gitweb is mod_perl capable
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 21, 2021, 19:57 UTC
- Message-ID
- <patch-4.6-4feeeb12aca-20211021T195538Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.6-00000000000-20211021T195538Z-avarab@gmail.com>
Remove a check for whether mod_perl is a supported mode of gitweb.cgi added in a51d37c1df6 (Add git-instaweb, instantly browse the working repo with gitweb, 2006-07-01).
The reason for the check was to support users who had a newer version of git and an older version of gitweb, it was then subsequently adjusted for changes in the script in f0e588dffc1 (git-instaweb: fix mod_perl detection for apache2, 2009-08-08).
It's a fair bet that nobody's running a git from 2021 and gitweb from pre-2007 anymore, so we can unconditionally assume that this will be supported by gitweb.cgi.
This allows a subsequent commit to remove the sane_grep() wrapper, this change is split up from that since this is the only case where the "grep" invocation could be removed entirely.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- git-instaweb.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/git-instaweb.sh b/git-instaweb.sh index 7c55229773e..54094fbe8de 100755 --- a/git-instaweb.sh +++ b/git-instaweb.sh @@ -380,10 +380,7 @@ TypesConfig "$fqgitdir/mime.types" DirectoryIndex gitweb.cgi EOF - # check to see if Dennis Stosberg's mod_perl compatibility patch - # (<20060621130708.Gcbc6e5c@leonov.stosberg.net>) has been applied - if test -f "$module_path/mod_perl.so" && - sane_grep 'MOD_PERL' "$root/gitweb.cgi" >/dev/null + if test -f "$module_path/mod_perl.so" then # favor mod_perl if available cat >> "$conf" <<EOF
-- 2.33.1.1494.g88b39a443e1