From 191662215012bee126c413bbaf9bf9953724dd2c Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 18 Jan 2015 16:04:40 -0800 Subject: [PATCH] Git binaries can be in a new location http://virtualmin.com/node/35642 --- virtual_feature.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/virtual_feature.pl b/virtual_feature.pl index 6ad81f6..cab153a 100755 --- a/virtual_feature.pl +++ b/virtual_feature.pl @@ -136,8 +136,10 @@ sub feature_setup # Setup gitweb if possible &$virtual_server::first_print($text{'feat_gitweb'}); local $git = &has_command("git") || "git"; -local $gitdir = -e "/usr/lib/git-core/git-rev-list" ? "/usr/lib/git-core" : - $git =~ /^(.*)\// ? $1 : "/usr/bin"; +local $gitdir = + -e "/usr/lib/git-core/git-rev-list" ? "/usr/lib/git-core" : + -e "/usr/libexec/git-core/git-rev-list" ? "/usr/libexec/git-core" : + $git =~ /^(.*)\// ? $1 : "/usr/bin"; local $src = &find_gitweb(); local $gitweb = "$phd/git/gitweb.cgi"; &virtual_server::copy_source_dest_as_domain_user($d, $src, $gitweb);