diff --git a/doc/generate_helper_doc.py b/doc/generate_helper_doc.py index a97d424eb..51da47c21 100644 --- a/doc/generate_helper_doc.py +++ b/doc/generate_helper_doc.py @@ -3,10 +3,19 @@ import os import glob import datetime +import subprocess +def get_current_git_branch(): + p = subprocess.Popen("git rev-parse --verify HEAD", shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + stdout, stderr = p.communicate() + + current_branch = stdout.strip().decode('utf-8') + return current_branch def render(helpers): + current_branch = get_current_git_branch() + data = {"helpers": helpers, "date": datetime.datetime.now().strftime("%m/%d/%Y"), "version": open("../debian/changelog").readlines()[0].split()[1].strip("()") @@ -25,7 +34,7 @@ def render(helpers): template = open("helper_doc_template.html", "r").read() t = Template(template) t.globals['now'] = datetime.datetime.utcnow - result = t.render(data=data, convert=shell_to_html, shell_css=shell_css) + result = t.render(current_branch=current_branch, data=data, convert=shell_to_html, shell_css=shell_css) open("helpers.html", "w").write(result) ############################################################################## @@ -197,7 +206,7 @@ def main(): for helper_file in helper_files: category_name = os.path.basename(helper_file) - print "Parsing %s ..." % category_name + print("Parsing %s ..." % category_name) p = Parser(helper_file) p.parse_blocks() for b in p.blocks: diff --git a/doc/helper_doc_template.html b/doc/helper_doc_template.html index f96a0190e..4d73a6de9 100644 --- a/doc/helper_doc_template.html +++ b/doc/helper_doc_template.html @@ -2,7 +2,7 @@
Doc auto-generated by this script on {{data.date}} (Yunohost version {{data.version}})
+Doc auto-generated by this script on {{data.date}} (Yunohost version {{data.version}})
{% for category, helpers in data.helpers %} @@ -72,7 +72,7 @@ {% endif %}