Fix a bug in the REVISION hack

On a fresh omnibus build, when the gitlab-core repo has not been checked out yet, the previous code would stop omnibus from loading.

Fix a bug in the REVISION hack
On a fresh omnibus build, when the gitlab-core repo has not been checked out yet, the previous code would stop omnibus from loading.
Jacob Vosmaer
1 parent 3bc80dd2
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
config/software/gitlab-core.rb
@@ -35,7 +35,7 @@ build do
   # this assumption does not hold. The sed command below patches the GitLab
   # source code to include the Git revision of the code included in the omnibus
   # build.
-  command "sed -i 's/.*REVISION.*/REVISION = \"#{version_guid.split(':').last[0,10]}\"/' config/initializers/2_app.rb"
+  command "sed -i \"s/.*REVISION.*/REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb"
   bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem"
	@@ -35,7 +35,7 @@ build do		@@ -35,7 +35,7 @@ build do
35	# this assumption does not hold. The sed command below patches the GitLab	35	# this assumption does not hold. The sed command below patches the GitLab
36	# source code to include the Git revision of the code included in the omnibus	36	# source code to include the Git revision of the code included in the omnibus
37	# build.	37	# build.
38	- command "sed -i 's/.REVISION./REVISION = \"#{version_guid.split(':').last[0,10]}\"/' config/initializers/2_app.rb"	38	+ command "sed -i \"s/.REVISION./REVISION = '$(git log --pretty=format:'%h' -n 1)'/\" config/initializers/2_app.rb"
39		39
40	bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem"	40	bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem"
41		41