From f7723d1c839d2452b2fa8da78fa6488e97b1aeea Mon Sep 17 00:00:00 2001 From: Alexey Chebotar Date: Mon, 23 Jan 2017 15:18:06 +0100 Subject: [PATCH] Fixed installation of Gitolite3 hooks via moving .chomp into RedmineGitHosting::Commands.sudo_gitolite_query_rc so that gitolite_local_code_dir also chomped (it was generating path like this "/var/lib/git/local\n/hooks/common/post-receive") --- lib/redmine_git_hosting/commands/gitolite.rb | 2 +- lib/redmine_git_hosting/config/gitolite_base.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/redmine_git_hosting/commands/gitolite.rb b/lib/redmine_git_hosting/commands/gitolite.rb index 897b938f2..7b44c11fc 100644 --- a/lib/redmine_git_hosting/commands/gitolite.rb +++ b/lib/redmine_git_hosting/commands/gitolite.rb @@ -17,7 +17,7 @@ def gitolite_infos def sudo_gitolite_query_rc(param) begin - sudo_capture('gitolite', 'query-rc', param) + sudo_capture('gitolite', 'query-rc', param).try(:chomp) rescue RedmineGitHosting::Error::GitoliteCommandException => e logger.error("Can't retrieve Gitolite param : #{e.output}") nil diff --git a/lib/redmine_git_hosting/config/gitolite_base.rb b/lib/redmine_git_hosting/config/gitolite_base.rb index 47403d2f5..771cd945c 100644 --- a/lib/redmine_git_hosting/config/gitolite_base.rb +++ b/lib/redmine_git_hosting/config/gitolite_base.rb @@ -29,12 +29,12 @@ def gitolite_home_dir def gitolite_bin_dir - @gitolite_bin_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_BINDIR').try(:chomp) + @gitolite_bin_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_BINDIR') end def gitolite_lib_dir - @gitolite_lib_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_LIBDIR').try(:chomp) + @gitolite_lib_dir ||= RedmineGitHosting::Commands.sudo_gitolite_query_rc('GL_LIBDIR') end