From 0627c74e0d733561a5c80eca7a12535ba8da5d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:07:19 -0800 Subject: [PATCH 1/2] rename index page to simplify docs url to /docs// --- docs/content/{Home.md => index.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/content/{Home.md => index.md} (100%) diff --git a/docs/content/Home.md b/docs/content/index.md similarity index 100% rename from docs/content/Home.md rename to docs/content/index.md From 6ee917b770c9f05b014231f85b206276e726535b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= Date: Tue, 5 Nov 2013 15:20:55 -0800 Subject: [PATCH 2/2] smarter deploy script --- docs/_bin/deploy-docs.sh | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/docs/_bin/deploy-docs.sh b/docs/_bin/deploy-docs.sh index f29fe15a5df..9c8c136f0c0 100755 --- a/docs/_bin/deploy-docs.sh +++ b/docs/_bin/deploy-docs.sh @@ -1,21 +1,21 @@ #! /bin/bash -e - -SCRIPT_DIR=`dirname $0` -pushd $SCRIPT_DIR -SCRIPT_DIR=`pwd` -popd +SCRIPT_DIR=$(cd $(dirname "$0") && pwd) if [ -z ${1} ]; then - pushd $SCRIPT_DIR - VERSION=`cat ../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*\([^<]*\).*_\1_'` - popd + VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*\([^<]*\).*_\1_') else VERSION=${1} fi -WORKING_DIR=/tmp/docs-deploy +#if [ -z "$(git tag -l "druid-$VERSION")" ] +if [ -z "$(git tag -l "druid-$VERSION")" ] && [ "$VERSION" != "latest" ]; then + echo "Version tag does not exist: druid-$VERSION" + exit 1; +fi -echo Using Version[${VERSION}] +WORKING_DIR=$(mktemp -d -t druid-docs-deploy) + +echo Using Version [${VERSION}] echo Script in [${SCRIPT_DIR}] echo Deploying to [${WORKING_DIR}] @@ -37,11 +37,8 @@ BRANCH=docs-${VERSION} pushd ${WORKING_DIR} git checkout -b ${BRANCH} git add . -git commit -m "Deploy new docs version ${VERSION}" +git commit -m "Deploy ${VERSION} docs" git push origin ${BRANCH} popd rm -rf ${WORKING_DIR} - - -