summaryrefslogtreecommitdiff
path: root/bin/gitlab-shell
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-13 08:35:51 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-04-13 08:35:51 +0000
commitbf34fa788255454430cd9d1b9f45c2755258aabf (patch)
tree44d6ad48176324c884b7b26062960e65dfe781a6 /bin/gitlab-shell
parentfd677db79be3dfa92e77f7a664a65c6aa24607ff (diff)
parent3c2ad9cb723b18537eae0ef41a42014484e5e74e (diff)
downloadgitlab-shell-bf34fa788255454430cd9d1b9f45c2755258aabf.tar.gz
Merge branch 'gl-id-refactor' into 'master'
Refactor logic around GL_ID. Builds upon !8. See merge request !9
Diffstat (limited to 'bin/gitlab-shell')
-rwxr-xr-xbin/gitlab-shell5
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/gitlab-shell b/bin/gitlab-shell
index 8154029..084f0c9 100755
--- a/bin/gitlab-shell
+++ b/bin/gitlab-shell
@@ -5,6 +5,9 @@ unless ENV['SSH_CONNECTION']
exit
end
+key_id = /key-[0-9]+/.match(ARGV.join).to_s
+original_cmd = ENV['SSH_ORIGINAL_COMMAND']
+
require_relative '../lib/gitlab_init'
#
@@ -14,7 +17,7 @@ require_relative '../lib/gitlab_init'
#
require File.join(ROOT_PATH, 'lib', 'gitlab_shell')
-if GitlabShell.new.exec
+if GitlabShell.new(key_id, original_cmd).exec
exit 0
else
exit 1