Merge branch 'master' of github.com:metamx/druid

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_.*<version>\([^<]*\)</version>.*_\1_'`
-    popd
+    VERSION=$(cat $SCRIPT_DIR/../../pom.xml | grep version | head -4 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\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}
-
-
-