# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1560934462 -7200 # Wed Jun 19 10:54:22 2019 +0200 # Node ID f550ff30da976e96273bb1dfd91ddc2052427823 # Parent 2006f56d5f23954ec21b09af85e5c0353620cce3 📠avoid guessing branch name for each potential documentation directory diff --git a/conf2reST.py b/conf2reST.py --- a/conf2reST.py +++ b/conf2reST.py @@ -13,9 +13,9 @@ _logger = logging.getLogger(__name__) -__version__ = '0.2.0' +__version__ = '0.2.1' __date__ = '2016-07-15' -__updated__ = '2019-06-05' +__updated__ = '2019-06-19' def main(argv=None): # IGNORE:C0111 diff --git a/create_documentation b/create_documentation --- a/create_documentation +++ b/create_documentation @@ -28,17 +28,19 @@ pushd $project_home +# determine branch name +if [ -n "$DRONE_BRANCH" ]; then +branch="$DRONE_BRANCH" +elif [ -e ".git" ]; then +branch="$(git rev-parse --abbrev-ref HEAD)" +elif [ -e ".hg" ]; then +branch="$(hg id -b)" +else +echo "${RED}WARN${RESET} - Branch name not found" +branch="unknown" +fi + for doc_dir in doc docs; do - if [ -n "$DRONE_BRANCH" ]; then - branch="$DRONE_BRANCH" - elif [ -e ".git" ]; then - branch="$(git rev-parse --abbrev-ref HEAD)" - elif [ -e ".hg" ]; then - branch="$(hg id -b)" - else - echo "${RED}WARN${RESET} - Branch name not found" - branch="unknown" - fi if [[ -d "$doc_dir" ]] ; then pushd $doc_dir for language in "en" ; do