Download as
Browse Code »

Commit b77c8a6c31e5ee1c1c5534c5caa87bd191b6175d

Authored by Jacob Vosmaer
1 parent 3cf206a2
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

Use local instead of instance variables in ERB

Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
config/templates/gitlab-core/bundle_exec_wrapper.erb
  Diff comments   View file @b77c8a6
1 #!/bin/bash 1 #!/bin/bash
2 -export PATH=<%= @install_dir %>/bin:<%= @install_dir %>/embedded/bin:$PATH 2 +export PATH=<%= install_dir %>/bin:<%= install_dir %>/embedded/bin:$PATH
3 3
4 # default to RAILS_ENV=production 4 # default to RAILS_ENV=production
5 if [[ -z $RAILS_ENV ]]; then 5 if [[ -z $RAILS_ENV ]]; then
6 export RAILS_ENV=production 6 export RAILS_ENV=production
7 fi 7 fi
8 8
9 -gitlab_user=$(ls -lLd <%= @install_dir %>/embedded/service/gitlab-core/log | awk '{ print $3 }') 9 +gitlab_user=$(ls -lLd <%= install_dir %>/embedded/service/gitlab-core/log | awk '{ print $3 }')
10 10
11 -cd <%= @install_dir %>/embedded/service/gitlab-core  
12 -exec <%= @install_dir %>/embedded/bin/chpst -u $gitlab_user -U $gitlab_user <%= @install_dir %>/embedded/bin/bundle exec <%= @command %> 11 +cd <%= install_dir %>/embedded/service/gitlab-core
  12 +exec <%= install_dir %>/embedded/bin/chpst -u $gitlab_user -U $gitlab_user <%= install_dir %>/embedded/bin/bundle exec <%= command %>