Download as
Browse Code »

Commit dca8f6d4a63d377095383a3309aa1c93f63cdb00

Authored by Dmitriy Zaporozhets
2 parents d33d550e 30f8713a
Exists in spb-stable and in 3 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb

Merge pull request #6492 from tsigo/gitlab-shell-custom-path 

Respect custom gitlab_shell path in gitlab:gitlab_shell:check task
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
lib/tasks/gitlab/check.rake
  Diff comments   View file @dca8f6d
... ... @@ -489,7 +489,7 @@ namespace :gitlab do
489 489 "sudo -u #{gitlab_shell_ssh_user} ln -sf #{gitlab_shell_hook_file} #{project_hook_file}"
490 490 )
491 491 for_more_information(
492   - "#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh"
  492 + "#{gitlab_shell_path}/support/rewrite-hooks.sh"
493 493 )
494 494 fix_and_rerun
495 495 next
... ... @@ -513,7 +513,7 @@ namespace :gitlab do
513 513 end
514 514  
515 515 def check_gitlab_shell_self_test
516   - gitlab_shell_repo_base = File.expand_path('gitlab-shell', gitlab_shell_user_home)
  516 + gitlab_shell_repo_base = gitlab_shell_path
517 517 check_cmd = File.expand_path('bin/check', gitlab_shell_repo_base)
518 518 puts "Running #{check_cmd}"
519 519 if system(check_cmd, chdir: gitlab_shell_repo_base)
... ... @@ -559,8 +559,8 @@ namespace :gitlab do
559 559 # Helper methods
560 560 ########################
561 561  
562   - def gitlab_shell_user_home
563   - File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}")
  562 + def gitlab_shell_path
  563 + Gitlab.config.gitlab_shell.path
564 564 end
565 565  
566 566 def gitlab_shell_version
... ...