This is an automated email from the ASF dual-hosted git repository. rubys pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push: new bd48ee2 ensure svnmucc is in the path new 1658848 Merge branch 'master' of github.com:apache/whimsy bd48ee2 is described below commit bd48ee2d83b35d141074f383c3118d46307aed08 Author: Sam Ruby <ru...@intertwingly.net> AuthorDate: Tue Jun 30 15:37:53 2020 -0400 ensure svnmucc is in the path --- config/setupmymac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/setupmymac b/config/setupmymac index 4fa34cd..1f6f420 100755 --- a/config/setupmymac +++ b/config/setupmymac @@ -212,7 +212,7 @@ if not $root and option != :docker # Prompt for xcode installation `git --version` unless $dry_run - unless system 'svn --help > /dev/null 2>&1' + unless system 'svn --help > /dev/null 2>&1' or `which svnmucc`.empty? brew 'install', 'subversion' end end @@ -509,7 +509,8 @@ wconf_source = "#{WHIMSY}/config/whimsy.conf" wconf_content = File.read(wconf_source) if wconf_content =~ /^\s*SetEnv PATH /i wconf_content[/^\s*SetEnv PATH .*/] = - "SetEnv PATH #{File.dirname RbConfig.ruby}:${PATH}" + "SetEnv PATH #{File.dirname RbConfig.ruby}:" + + "#{File.dirname(`which svnmucc`)}:${PATH}" end wconf_target = '/private/etc/apache2/other/whimsy.conf' if