[DRE-commits] [gitlab-shell] 01/01: fix bin/gitlab-shell as well

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch master
in repository gitlab-shell.

commit c267d7d2bd9cf01f9dd6a552e1cfd80a103208be
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Nov 13 16:53:10 2015 +0530

    fix bin/gitlab-shell as well
---
 debian/patches/use-system-libs.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index 12fd116..843b3c8 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -70,3 +70,25 @@ Index: gitlab-shell/bin/install
  
  #
  # GitLab shell, invoked from ~/.ssh/authorized_keys
+Index: gitlab-shell/bin/gitlab-shell
+===================================================================
+--- gitlab-shell.orig/bin/gitlab-shell
++++ gitlab-shell/bin/gitlab-shell
+@@ -8,14 +8,15 @@ end
+ key_id = /key-[0-9]+/.match(ARGV.join).to_s
+ original_cmd = ENV['SSH_ORIGINAL_COMMAND']
+ 
+-require_relative '../lib/gitlab_init'
++$:.unshift File.expand_path('../lib', __FILE__)
++require_relative 'gitlab_init'
+ 
+ #
+ #
+ # GitLab shell, invoked from ~/.ssh/authorized_keys
+ #
+ #
+-require File.join(ROOT_PATH, 'lib', 'gitlab_shell')
++require 'gitlab_shell'
+ 
+ if GitlabShell.new(key_id, original_cmd).exec
+   exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab-shell.git