From 0adbe359a0e448e0a8007b0041890e33a612a4dc Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 23 Nov 2017 15:41:39 +0100 Subject: 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 to not rely on this parameter. Change-Id: Ied88466b2b3d91a3317922fa08f60afe934358a0 Signed-off-by: Alexandru Avadanii --- mcp/scripts/salt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit 1.2.3-korg