Merge branch 'gitlab-shell' into 'master'

Include gitlab-shell into the project

Merge branch 'gitlab-shell' into 'master'
Include gitlab-shell into the project
Jacob Vosmaer
2 parents 5cf999ac 06c1402b
Showing 3 changed files with 15 additions and 3 deletions Show diff stats
Gemfile.lock
config/projects/gitlab.rb
config/software/gitlab-shell.rb
 GIT
   remote: git://github.com/opscode/omnibus-software.git
-  revision: 42d0a22686dcbc81b96f8bc2e544e706c7426121
+  revision: b899b8aa021b565708237486c3cb71566dc661eb
   branch: master
   specs:
     omnibus-software (0.0.1)
@@ -28,8 +28,7 @@ build_iteration 1
 # creates required build directories
 dependency "preparation"
-# GitLab dependencies/components
-dependency "gitlab"
+dependency "gitlab-shell"
 # version manifest file
 dependency "version-manifest"
@@ -0,0 +1,13 @@
+name "gitlab-shell"
+version "v1.8.0"
+
+dependency "ruby"
+dependency "rsync"
+
+source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
+
+build do
+  command "sed -i 's|^#!/usr/bin/env ruby|#!#{install_dir}/embedded/bin/ruby|' $(grep -r -l '#!/usr/bin/env ruby' .)"
+  command "mkdir -p #{install_dir}/embedded/services/gitlab-shell"
+  command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/services/gitlab-shell/"
+end
1	GIT	1	GIT
2	remote: git://github.com/opscode/omnibus-software.git	2	remote: git://github.com/opscode/omnibus-software.git
3	- revision: 42d0a22686dcbc81b96f8bc2e544e706c7426121	3	+ revision: b899b8aa021b565708237486c3cb71566dc661eb
4	branch: master	4	branch: master
5	specs:	5	specs:
6	omnibus-software (0.0.1)	6	omnibus-software (0.0.1)
	@@ -28,8 +28,7 @@ build_iteration 1		@@ -28,8 +28,7 @@ build_iteration 1
28	# creates required build directories	28	# creates required build directories
29	dependency "preparation"	29	dependency "preparation"
30		30
31	-# GitLab dependencies/components
32	-dependency "gitlab"	31	+dependency "gitlab-shell"
33		32
34	# version manifest file	33	# version manifest file
35	dependency "version-manifest"	34	dependency "version-manifest"
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+name "gitlab-shell"
	2	+version "v1.8.0"
	3	+
	4	+dependency "ruby"
	5	+dependency "rsync"
	6	+
	7	+source :git => "https://gitlab.com/gitlab-org/gitlab-shell.git"
	8	+
	9	+build do
	10	+ command "sed -i 's\|^#!/usr/bin/env ruby\|#!#{install_dir}/embedded/bin/ruby\|' $(grep -r -l '#!/usr/bin/env ruby' .)"
	11	+ command "mkdir -p #{install_dir}/embedded/services/gitlab-shell"
	12	+ command "#{install_dir}/embedded/bin/rsync -a --delete --exclude=.git/*** --exclude=.gitignore ./ #{install_dir}/embedded/services/gitlab-shell/"
	13	+end