summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <Michael.Stahl@cib.de>2018-08-30 15:27:55 +0200
committerMichael Stahl <Michael.Stahl@cib.de>2018-08-30 15:32:12 +0200
commit2ed18399f034982a5d7f2ed46144a4b66987baef (patch)
tree12784a94e30c3552323f1ac0638ace980b6ce5de /solenv
parent13a05eec7377c013d9c13deeee6473a9e863c897 (diff)
solenv: fix markdown issues in mkdocs.sh
- Fedora 28 has python3-markdown2 package containing /usr/bin/markdown2-3 - the "alias" doesn't work at all because it's not exported to the sub-shell in $(markdown) so use variable instead Change-Id: Icf2af1e66750269e0660f3897a91734cadf5d978
Diffstat (limited to 'solenv')
-rwxr-xr-xsolenv/bin/mkdocs.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/mkdocs.sh b/solenv/bin/mkdocs.sh
index 99579f71340a..e83e749bde27 100755
--- a/solenv/bin/mkdocs.sh
+++ b/solenv/bin/mkdocs.sh
@@ -101,7 +101,7 @@ function check_cmd {
echo "$error_msg" >&2
exit 1
fi
- alias "${cmds_needed%% *}"=$cmd
+ export "${cmds_needed%% *}"=$cmd
}
function setup {
@@ -120,7 +120,7 @@ function setup {
# binaries that we need
check_cmd doxygen "You need doxygen for doc generation"
check_cmd dot "You need the graphviz tools to create the nice inheritance graphs"
-check_cmd "markdown markdown2" "You need either markdown or markdown2 in order to convert README.md into html"
+check_cmd "markdown markdown2 markdown2-3" "You need either markdown or markdown2 in order to convert README.md into html"
# suck setup
setup "SOLARINC"
@@ -253,7 +253,7 @@ for module_name in *; do
if [ ${cur_file: -3} == ".md" ]; then
# This is a markdown file.
- text="$(markdown $cur_file | proc_text_markdown)"
+ text="$(${markdown} $cur_file | proc_text_markdown)"
echo $text >> "$BASE_OUTPUT/${module_name}.html"
else
proc_text < $cur_file >> "$BASE_OUTPUT/${module_name}.html"