summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-24 15:47:02 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-24 16:45:03 +0100
commitd9ca1bce7a52709aa9d1aa60940cab69861e09c0 (patch)
tree837a57cb6a0add31926ca7b2306afad6c6969a02 /lib
parenta9e2fa4c35604da4be37493cf7378e247d84f739 (diff)
downloadgitlab-ce-d9ca1bce7a52709aa9d1aa60940cab69861e09c0.tar.gz
Fix paths in gitlab:check
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/check.rake8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 540299c592e..f8448d19666 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -317,7 +317,7 @@ namespace :gitlab do
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... "
- profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile")
+ profile_file = File.join(gitolite_home, ".profile")
unless File.read(profile_file) =~ /^-e PATH/
puts "yes".green
@@ -474,7 +474,7 @@ namespace :gitlab do
def check_dot_gitolite_exists
print "Config directory exists? ... "
- gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
+ gitolite_config_path = File.join(gitolite_home, ".gitolite")
if File.directory?(gitolite_config_path)
puts "yes".green
@@ -495,7 +495,7 @@ namespace :gitlab do
def check_dot_gitolite_permissions
print "Config directory access is drwxr-x---? ... "
- gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
+ gitolite_config_path = File.join(gitolite_home, ".gitolite")
unless File.exists?(gitolite_config_path)
puts "can't check because of previous errors".magenta
return
@@ -519,7 +519,7 @@ namespace :gitlab do
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... "
- gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite")
+ gitolite_config_path = File.join(gitolite_home, ".gitolite")
unless File.exists?(gitolite_config_path)
puts "can't check because of previous errors".magenta
return