From c73d4497fdd1d396b5b2e3c57838aa7f0f417c6f Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Mon, 17 Mar 2014 16:43:22 +0100 Subject: [PATCH] Move build-time EE check into a script --- Makefile | 2 +- support/is_gitlab_ee.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100755 support/is_gitlab_ee.sh diff --git a/Makefile b/Makefile index cc41b37..51685c2 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ remove_json: find pkg/ -name '*.json' -delete move_ee_to_secret_dir: - if (git describe | grep -q -w ee); then \ + if support/is_gitlab_ee.sh ; then \ mv pkg ${SECRET_DIR} \ && mkdir pkg \ && mv ${SECRET_DIR} pkg/ \ diff --git a/support/is_gitlab_ee.sh b/support/is_gitlab_ee.sh new file mode 100755 index 0000000..10a15e1 --- /dev/null +++ b/support/is_gitlab_ee.sh @@ -0,0 +1,2 @@ +#!/bin/bash +[[ -n $ee ]] || grep -q '^source.*"git@gitlab.com:subscribers/gitlab-ee.git"' config/software/gitlab-rails.rb -- libgit2 0.21.2