bcc608f · typeable/pandoc

git.iko.soy/typeable/pandoc

on master help sign in

Fixed a bug in website generation, which only worked if 'pandoc'

bcc608ffiddlosopher20 years ago

Makefile+1−1

compare with master

unifiedsplit

@@ -374,7 +374,7 @@ $(web_dest)/: $(MAIN) html

374 cp $(web_src)/S5DEMO $(web_dest)/ ; \

375 cp $(web_src)/header.html $(web_dest)/ ; \

376 cp $(web_src)/footer.html $(web_dest)/ ; \

377− sh $(web_src)/mkdemos.sh $(web_dest) $(abspath .) | \

377+ sh $(web_src)/mkdemos.sh $(web_dest) $(shell pwd) | \

378 $(make_page) > $(web_dest)/examples.html; \

379 ) || { rm -rf $(web_dest); exit 1; }

380

web/mkdemos.sh+1−2

@@ -27,7 +27,6 @@ set -- $EXAMPLES

27IFS=$oldifs

29cd $DEST

30−PATH=$PROGPATH:$PATH

32echo '% Pandoc examples

31echo '% Pandoc examples

@@ -44,6 +43,6 @@ for command in "$@"; do

44 output=$(echo $command | sed -e 's/.*-o $.*$/\1/')

43 output=$(echo $command | sed -e 's/.*-o $.*$/\1/')

45 echo "1. <code>$firstpart <a href=\""$input"\" title=\""View input file"\">$input</a> -o <a href=\""$output"\" title=\""View pandoc output"\">$output</a></code>"

44 echo "1. <code>$firstpart <a href=\""$input"\" title=\""View input file"\">$input</a> -o <a href=\""$output"\" title=\""View pandoc output"\">$output</a></code>"

46 echo $command >&2

45 echo $command >&2

47− result=$($command) # run the command and create output file

46+ result=$(PATH=$PROGPATH:$PATH $command) # run the command and create output file

48done

47done