diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2019-10-09 02:20:36 +0000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-10-09 02:20:36 +0000 |
commit | e28f75c8d439812f61c4cf0c0291380df4d17106 (patch) | |
tree | 5e4ae582eb3aa506c57f954d2a1483fe5e003a2b /support | |
parent | 1ee64eeaea71210e89040438489edac4701a1854 (diff) | |
parent | 1a3e687f772047988b9bcaeb471d94d6f49a853e (diff) | |
download | gitlab-shell-e28f75c8d439812f61c4cf0c0291380df4d17106.tar.gz |
Merge branch '173-remove-bin-install-command' into 'master'
Decouple `bin/compile` and `bin/install` from code in `lib/`
See merge request gitlab-org/gitlab-shell!340
Diffstat (limited to 'support')
-rw-r--r-- | support/gitlab_config.rb | 13 | ||||
-rw-r--r-- | support/go_build.rb | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/support/gitlab_config.rb b/support/gitlab_config.rb new file mode 100644 index 0000000..1416488 --- /dev/null +++ b/support/gitlab_config.rb @@ -0,0 +1,13 @@ +require 'yaml' + +class GitlabConfig + attr_reader :config + + def initialize + @config = YAML.load_file(File.join(ROOT_PATH, 'config.yml')) + end + + def auth_file + @config['auth_file'] ||= File.join(Dir.home, '.ssh/authorized_keys') + end +end diff --git a/support/go_build.rb b/support/go_build.rb index 42e207a..6f4c92b 100644 --- a/support/go_build.rb +++ b/support/go_build.rb @@ -2,8 +2,8 @@ require 'fileutils' -# This will set the ROOT_PATH variable -require_relative '../lib/gitlab_init' +# Determine the root of the gitlab-shell directory +ROOT_PATH = ENV.fetch('GITLAB_SHELL_DIR', File.expand_path('..', __dir__)) module GoBuild GO_DIR = File.join(ROOT_PATH, 'go') |