summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-23 15:41:39 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-24 18:53:52 +0000
commit156e8d63c62f5f0c0c93f0f6ccd1818aa4dd6332 (patch)
tree24a6b22decdaffc7ca07e2327a3500e11ea48e0e /mcp
parentf0d5de1c3ccb8f422f51e63f14a113ee1a39e270 (diff)
salt.sh: Rework `git -C` for older git compat
CentOS 7.4 provides git 1.8.3, while `git -C` support was introduced in 1.8.5, so rework <salt.sh> to not rely on this parameter. Change-Id: Ied88466b2b3d91a3317922fa08f60afe934358a0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 0adbe359a0e448e0a8007b0041890e33a612a4dc)
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/scripts/salt.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh
index 631cc4ad9..ab096f3ee 100755
--- a/mcp/scripts/salt.sh
+++ b/mcp/scripts/salt.sh
@@ -12,7 +12,7 @@
CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x
F_GIT_ROOT=$(git rev-parse --show-toplevel)
-F_GIT_DIR=$(git -C "${F_GIT_ROOT}/mcp" rev-parse --git-dir)
+F_GIT_DIR=$(cd "${F_GIT_ROOT}/mcp" && git rev-parse --git-dir)
F_GIT_SUBD=${F_GIT_ROOT#${F_GIT_DIR%%/.git*}}
OPNFV_TMP_DIR="/home/${SALT_MASTER_USER}/opnfv"
OPNFV_GIT_DIR="/root/opnfv"