From 5e27efb2300ef6d7e9088dbac57d740e5a1935a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ho=CC=88ltje?= Date: Thu, 24 Sep 2020 14:28:00 -0400 Subject: [PATCH] fix: strip .git off url properly `basename` is too aggressive and removes the hostname and path. --- src/hrval.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hrval.sh b/src/hrval.sh index 08b1f20..7338b49 100755 --- a/src/hrval.sh +++ b/src/hrval.sh @@ -61,8 +61,8 @@ function clone { CHART_GIT_REPO=$(yq r ${1} spec.chart.git) RELEASE_GIT_REPO=$(git remote get-url origin) - CHART_BASE_URL=$(basename $(echo "${CHART_GIT_REPO}" | sed -e 's/ssh:\/\///' -e 's/http:\/\///' -e 's/https:\/\///' -e 's/git@//' -e 's/:/\//') .git ) - RELEASE_BASE_URL=$(basename $(echo "${RELEASE_GIT_REPO}" | sed -e 's/ssh:\/\///' -e 's/http:\/\///' -e 's/https:\/\///' -e 's/git@//' -e 's/:/\//') .git ) + CHART_BASE_URL=$(echo "${CHART_GIT_REPO}" | sed -e 's/ssh:\/\///' -e 's/http:\/\///' -e 's/https:\/\///' -e 's/git@//' -e 's/:/\//' -e 's/\.git$//') + RELEASE_BASE_URL=$(echo "${RELEASE_GIT_REPO}" | sed -e 's/ssh:\/\///' -e 's/http:\/\///' -e 's/https:\/\///' -e 's/git@//' -e 's/:/\//' -e 's/\.git$//') if [[ -n "${GITHUB_TOKEN}" ]]; then CHART_GIT_REPO="https://${GITHUB_TOKEN}:x-oauth-basic@${CHART_BASE_URL}"