Merge "defensive coding for docbook-properties.sh"

This commit is contained in:
Jenkins 2013-11-27 16:40:04 +00:00 committed by Gerrit Code Review
commit a63a95aff3

View File

@ -10,17 +10,16 @@
BRANCH=$ZUUL_REFNAME BRANCH=$ZUUL_REFNAME
# The master branch should get published to /trunk # The master branch should get published to /trunk
if [ $BRANCH == "master" ] if [[ $BRANCH == "master" ]]; then
then
DOC_RELEASE_PATH="trunk" DOC_RELEASE_PATH="trunk"
DOC_COMMENTS_ENABLED=0 DOC_COMMENTS_ENABLED=0
fi elif [[ $BRANCH =~ ^stable/(.*)$ ]]; then
# The stable/<releasename> branch should get published to /releasename, such as icehouse or havana
# The stable/<releasename> branch should get published to /releasename, such as icehouse or havana
if [[ $BRANCH =~ ^stable/(.*)$ ]]
then
DOC_RELEASE_PATH=${BASH_REMATCH[1]} DOC_RELEASE_PATH=${BASH_REMATCH[1]}
DOC_COMMENTS_ENABLED=1 DOC_COMMENTS_ENABLED=1
else
echo "Error: Branch($BRANCH) is invalid"
exit 1
fi fi
echo "DOC_RELEASE_PATH=$DOC_RELEASE_PATH" >gerrit-doc.properties echo "DOC_RELEASE_PATH=$DOC_RELEASE_PATH" >gerrit-doc.properties