diff options
| -rwxr-xr-x | bin/check | 5 | ||||
| -rwxr-xr-x | bin/create-hooks | 5 | ||||
| -rwxr-xr-x | bin/gitlab-keys | 3 | ||||
| -rwxr-xr-x | bin/gitlab-projects | 3 | ||||
| -rwxr-xr-x | bin/install | 3 | ||||
| -rw-r--r-- | lib/gitlab_init.rb | 6 |
6 files changed, 17 insertions, 8 deletions
@@ -1,7 +1,8 @@ #!/usr/bin/env ruby -require_relative '../lib/gitlab_init' -require_relative '../lib/gitlab_net' +$:.unshift File.expand_path('../lib', __FILE__) +require 'gitlab_init' +require 'gitlab_net' # # GitLab shell check task diff --git a/bin/create-hooks b/bin/create-hooks index 4efa650..b590aab 100755 --- a/bin/create-hooks +++ b/bin/create-hooks @@ -4,8 +4,9 @@ # # This script is used when restoring a GitLab backup. -require_relative '../lib/gitlab_init' -require File.join(ROOT_PATH, 'lib', 'gitlab_projects') +$:.unshift File.expand_path('../lib', __FILE__) +require 'gitlab_init' +require 'gitlab_projects' Dir["#{GitlabConfig.new.repos_path}/*/*.git"].each do |repo| begin diff --git a/bin/gitlab-keys b/bin/gitlab-keys index 9eb1950..ffe1ef0 100755 --- a/bin/gitlab-keys +++ b/bin/gitlab-keys @@ -1,6 +1,7 @@ #!/usr/bin/env ruby -require_relative '../lib/gitlab_init' +$:.unshift File.expand_path('../lib', __FILE__) +require 'gitlab_init' # # GitLab Keys shell. Add/remove keys from ~/.ssh/authorized_keys diff --git a/bin/gitlab-projects b/bin/gitlab-projects index c354fe5..b75665a 100755 --- a/bin/gitlab-projects +++ b/bin/gitlab-projects @@ -1,7 +1,8 @@ #!/usr/bin/env ruby -require_relative '../lib/gitlab_init' +$:.unshift File.expand_path('../lib', __FILE__) +require 'gitlab_init' # # GitLab Projects shell. Add/remove projects from /home/git/repositories diff --git a/bin/install b/bin/install index 9847ae1..1842f5b 100755 --- a/bin/install +++ b/bin/install @@ -1,6 +1,7 @@ #!/usr/bin/env ruby -require_relative '../lib/gitlab_init' +$:.unshift File.expand_path('../lib', __FILE__) +require 'gitlab_init' # # GitLab shell, invoked from ~/.ssh/authorized_keys diff --git a/lib/gitlab_init.rb b/lib/gitlab_init.rb index c3f35a2..d2fa95d 100644 --- a/lib/gitlab_init.rb +++ b/lib/gitlab_init.rb @@ -1,3 +1,7 @@ -ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) +if ENV['SHELL_ROOT_PATH'].nil? || ENV['SHELL_ROOT_PATH'].empty? + ROOT_PATH = File.expand_path(File.join(File.dirname(__FILE__), "..")) +else + ROOT_PATH = ENV['SHELL_ROOT_PATH'] +end require_relative 'gitlab_config' |