[DRE-commits] [gitlab-shell] 01/01: fix paths in hooks

[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 ce57471a69fe7b6031625a22669832d24508c0ee
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Jan 1 00:58:12 2016 +0530

    fix paths in hooks
---
 debian/patches/use-system-libs.patch | 46 ++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
index c750991..50902e0 100644
--- a/debian/patches/use-system-libs.patch
+++ b/debian/patches/use-system-libs.patch
@@ -109,3 +109,49 @@ Index: gitlab-shell/bin/gitlab-shell
  
  if GitlabShell.new(key_id).exec(original_cmd)
    exit 0
+Index: gitlab-shell/hooks/post-receive
+===================================================================
+--- gitlab-shell.orig/hooks/post-receive
++++ gitlab-shell/hooks/post-receive
+@@ -10,8 +10,9 @@ repo_path = Dir.pwd
+ # reset GL_ID env since we already got its value
+ ENV['GL_ID'] = nil
+ 
+-require_relative '../lib/gitlab_custom_hook'
+-require_relative '../lib/gitlab_post_receive'
++$:.unshift File.expand_path('../lib', __FILE__)
++require 'gitlab_custom_hook'
++require 'gitlab_post_receive'
+ 
+ if GitlabPostReceive.new(repo_path, key_id, refs).exec &&
+     GitlabCustomHook.new.post_receive(refs, repo_path)
+Index: gitlab-shell/hooks/pre-receive
+===================================================================
+--- gitlab-shell.orig/hooks/pre-receive
++++ gitlab-shell/hooks/pre-receive
+@@ -7,8 +7,9 @@ refs = ARGF.read
+ key_id  = ENV['GL_ID']
+ repo_path = Dir.pwd
+ 
+-require_relative '../lib/gitlab_custom_hook'
+-require_relative '../lib/gitlab_access'
++$:.unshift File.expand_path('../lib', __FILE__)
++require 'gitlab_custom_hook'
++require 'gitlab_access'
+ 
+ if GitlabAccess.new(repo_path, key_id, refs).exec &&
+     GitlabCustomHook.new.pre_receive(refs, repo_path)
+Index: gitlab-shell/hooks/update
+===================================================================
+--- gitlab-shell.orig/hooks/update
++++ gitlab-shell/hooks/update
+@@ -8,7 +8,8 @@ old_value = ARGV[1]
+ new_value = ARGV[2]
+ repo_path = Dir.pwd
+ 
+-require_relative '../lib/gitlab_custom_hook'
++$:.unshift File.expand_path('../lib', __FILE__)
++require_relative 'gitlab_custom_hook'
+ 
+ if GitlabCustomHook.new.update(ref_name, old_value, new_value, repo_path)
+   exit 0

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