From: David Galloway Date: Thu, 11 Jun 2020 16:02:16 +0000 (-0400) Subject: ceph-website: Support GIT_BRANCH with multiple slashes X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1585%2Fhead;p=ceph-build.git ceph-website: Support GIT_BRANCH with multiple slashes The SoftIron folks like to use branch names like 'origin/feature/multingual' so let's support that. Signed-off-by: David Galloway --- diff --git a/ceph-website/build/build b/ceph-website/build/build old mode 100644 new mode 100755 index 4cbab0c5..4da171d6 --- a/ceph-website/build/build +++ b/ceph-website/build/build @@ -4,7 +4,7 @@ set -ex ## TODO: Check if only the src/ dir changed and `exit 0` if only the ceph.io.git README or something else inconsequential changed. env -BRANCH=`branch_slash_filter ${GIT_BRANCH}` +BRANCH=$(echo $GIT_BRANCH | sed 's:.*/::') # Don't think this is even necessary #git checkout ${BRANCH}