Download as
Browse Code »

Commit fa2a22052d35ccfc10946c3cd956ad5316d33865

Authored by Jacob Vosmaer
2 parents 5cf999ac 06c1402b
Exists in master and in 17 other branches 6-6-stable, 6-6-stable-ee, 6-7-stable, 6-7-stable-ee, 6-8-stable, 6-8-stable-ee, 6-9-stable, 6-9-stable-ee, 7-0-stable, 7-0-stable-ee, 7-0-stable-spb, 7-1-stable, 7-1-stable-ee, 7-2-stable, 7-2-stable-ee, branch_test, nginx_ssl_tweaks

Merge branch 'gitlab-shell' into 'master' 

Include gitlab-shell into the project
Showing 3 changed files with 15 additions and 3 deletions   Show diff stats
Gemfile.lock
  Diff comments   View file @fa2a220
1 1 GIT
2 2 remote: git://github.com/opscode/omnibus-software.git
3   - revision: 42d0a22686dcbc81b96f8bc2e544e706c7426121
  3 + revision: b899b8aa021b565708237486c3cb71566dc661eb
4 4 branch: master
5 5 specs:
6 6 omnibus-software (0.0.1)
... ...
config/projects/gitlab.rb
  Diff comments   View file @fa2a220
... ... @@ -28,8 +28,7 @@ build_iteration 1
28 28 # creates required build directories
29 29 dependency "preparation"
30 30  
31   -# GitLab dependencies/components
32   -dependency "gitlab"
  31 +dependency "gitlab-shell"
33 32  
34 33 # version manifest file
35 34 dependency "version-manifest"
... ...
config/software/gitlab-shell.rb 0 → 100644
  Diff comments   View file @fa2a220
... ... @@ -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
... ...