Download as
Browse Code »

Commit d9ca1bce7a52709aa9d1aa60940cab69861e09c0

Authored by Riyad Preukschas
1 parent a9e2fa4c
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix paths in gitlab:check

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
lib/tasks/gitlab/check.rake
  Diff comments   View file @d9ca1bc
... ... @@ -317,7 +317,7 @@ namespace :gitlab do
317 317 gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
318 318 print "Has no \"-e\" in ~#{gitolite_ssh_user}/.profile ... "
319 319  
320   - profile_file = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.profile")
  320 + profile_file = File.join(gitolite_home, ".profile")
321 321  
322 322 unless File.read(profile_file) =~ /^-e PATH/
323 323 puts "yes".green
... ... @@ -474,7 +474,7 @@ namespace :gitlab do
474 474 def check_dot_gitolite_exists
475 475 print "Config directory exists? ... "
476 476  
477   - gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
  477 + gitolite_config_path = File.join(gitolite_home, ".gitolite")
478 478  
479 479 if File.directory?(gitolite_config_path)
480 480 puts "yes".green
... ... @@ -495,7 +495,7 @@ namespace :gitlab do
495 495 def check_dot_gitolite_permissions
496 496 print "Config directory access is drwxr-x---? ... "
497 497  
498   - gitolite_config_path = File.expand_path("~#{Gitlab.config.gitolite.ssh_user}/.gitolite")
  498 + gitolite_config_path = File.join(gitolite_home, ".gitolite")
499 499 unless File.exists?(gitolite_config_path)
500 500 puts "can't check because of previous errors".magenta
501 501 return
... ... @@ -519,7 +519,7 @@ namespace :gitlab do
519 519 gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
520 520 print "Config directory owned by #{gitolite_ssh_user}:#{gitolite_ssh_user} ... "
521 521  
522   - gitolite_config_path = File.expand_path("~#{gitolite_ssh_user}/.gitolite")
  522 + gitolite_config_path = File.join(gitolite_home, ".gitolite")
523 523 unless File.exists?(gitolite_config_path)
524 524 puts "can't check because of previous errors".magenta
525 525 return
... ...