Merge pull request #43 from docwhat/pr-docwhat/fix-git-url-munging

fix: strip .git off url properly
stefanprodan · Sep 29, 2020 · 1e61958 · 1e61958
2 parents 30ea7f0 + 5e27efb
commit 1e61958
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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}"