From eb9920ac382e606dada283a03fca6ddee80064a3 Mon Sep 17 00:00:00 2001 From: Charpentier Johan Date: Wed, 26 Sep 2012 17:02:44 +0200 Subject: [PATCH 1/2] Fix bug with relative/real path --- mkdocs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkdocs.py b/mkdocs.py index 8e1010dbf..268142f49 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -6,7 +6,7 @@ import re import shutil import sys -root_dir = os.path.dirname(__file__) +root_dir = os.path.abspath(os.path.split(__file__)[0]) docs_dir = os.path.join(root_dir, 'docs') html_dir = os.path.join(root_dir, 'html') @@ -60,7 +60,7 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): content = markdown.markdown(text, ['headerid']) - build_dir = os.path.join(html_dir, dirpath.lstrip(docs_dir)) + build_dir = os.path.join(html_dir, dirpath.partition(docs_dir)[2].lstrip("/")) build_file = os.path.join(build_dir, filename[:-3] + '.html') if not os.path.exists(build_dir): From efe26e3a3281c4663a5e500f764fb9a7068049cd Mon Sep 17 00:00:00 2001 From: Charpentier Johan Date: Thu, 27 Sep 2012 13:43:35 +0200 Subject: [PATCH 2/2] Improve changes with upstream's advices --- mkdocs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkdocs.py b/mkdocs.py index 268142f49..e88b210d2 100755 --- a/mkdocs.py +++ b/mkdocs.py @@ -6,7 +6,7 @@ import re import shutil import sys -root_dir = os.path.abspath(os.path.split(__file__)[0]) +root_dir = os.path.abspath(os.path.dirname(__file__)) docs_dir = os.path.join(root_dir, 'docs') html_dir = os.path.join(root_dir, 'html') @@ -60,7 +60,8 @@ for (dirpath, dirnames, filenames) in os.walk(docs_dir): content = markdown.markdown(text, ['headerid']) - build_dir = os.path.join(html_dir, dirpath.partition(docs_dir)[2].lstrip("/")) + category_dir = dirpath.replace(docs_dir, '').lstrip(os.path.sep) + build_dir = os.path.join(html_dir, category_dir) build_file = os.path.join(build_dir, filename[:-3] + '.html') if not os.path.exists(build_dir):