Robustify shocco install and config
* shocco has some non-optional prereqs, make sure they are present if shocco is being installed * set the path to installed shocco correctly * add the working dir to .gitignore Change-Id: If786ea9e28d3595775f7b86d2fe760dff8047f49
This commit is contained in:
parent
aa50a13135
commit
c04ddbe868
1
.gitignore
vendored
1
.gitignore
vendored
@ -13,5 +13,6 @@ stack-screenrc
|
||||
accrc
|
||||
.stackenv
|
||||
.prereqs
|
||||
devstack-docs-*
|
||||
docs/
|
||||
docs-files
|
||||
|
@ -28,22 +28,31 @@ MASTER_BRANCH=${MASTER_BRANCH:-master}
|
||||
# http://devstack.org is a GitHub gh-pages site in the https://github.com/cloudbuilders/devtack.git repo
|
||||
GH_PAGES_REPO=git@github.com:cloudbuilders/devstack.git
|
||||
|
||||
# Keep track of the devstack directory
|
||||
TOP_DIR=$(cd $(dirname "$0")/.. && pwd)
|
||||
|
||||
# Uses this shocco branch: https://github.com/dtroyer/shocco/tree/rst_support
|
||||
SHOCCO=${SHOCCO:-shocco}
|
||||
if ! which shocco; then
|
||||
if [[ ! -x shocco/shocco ]]; then
|
||||
if [[ ! -x $TOP_DIR/shocco/shocco ]]; then
|
||||
if [[ -z "$INSTALL_SHOCCO" ]]; then
|
||||
echo "shocco not found in \$PATH, please set environment variable SHOCCO"
|
||||
exit 1
|
||||
fi
|
||||
echo "Installing local copy of shocco"
|
||||
if ! which pygmentize; then
|
||||
sudo pip install Pygments
|
||||
fi
|
||||
if ! which rst2html.py; then
|
||||
sudo pip install docutils
|
||||
fi
|
||||
git clone -b rst_support https://github.com/dtroyer/shocco shocco
|
||||
cd shocco
|
||||
./configure
|
||||
make
|
||||
cd ..
|
||||
fi
|
||||
SHOCCO=shocco/shocco
|
||||
SHOCCO=$TOP_DIR/shocco/shocco
|
||||
fi
|
||||
|
||||
# Process command-line args
|
||||
|
Loading…
Reference in New Issue
Block a user