From 7a2e4881b8b9562b3a43d82c94d49270a9c2438d Mon Sep 17 00:00:00 2001
From: "Yichun Zhang (agentzh)" <agentzh@gmail.com>
Date: Thu, 12 May 2016 14:53:02 -0700
Subject: [PATCH] use resty-cli's md2pod.pl script to do the Markdown -> POD
 conversion since the perl CPAN module Markdown::Pod is both buggy and slow to
 install. thanks Paul Buonopane for the report in #175.

also upgraded resty-cli to 0.07rc1 for the md2pod.pl script.
---
 util/fix-pod2markdown | 20 --------------------
 util/mirror-tarballs  |  6 +++---
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100755 util/fix-pod2markdown

diff --git a/util/fix-pod2markdown b/util/fix-pod2markdown
deleted file mode 100755
index 6ba8e8f..0000000
--- a/util/fix-pod2markdown
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $indented;
-while (<>) {
-    if (/^ \S/) {
-        $indented = 1;
-        print;
-        next;
-    }
-    if ($indented) {
-        if (/^[^-\#=\s]/) {
-            print "\n";
-        }
-        undef $indented;
-    }
-    print;
-}
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index 61cb826..4f8e1e0 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -478,10 +478,11 @@ mv openresty-redis2-nginx-module-* redis2-nginx-module-$ver || exit 1
 
 #################################
 
-ver=0.06
+ver=0.07rc1
 $root/util/get-tarball "https://github.com/openresty/resty-cli/tarball/v$ver" -O resty-cli-$ver.tar.gz || exit 1
 tar -xzf resty-cli-$ver.tar.gz || exit 1
 mv openresty-resty-cli-* resty-cli-$ver || exit 1
+resty_cli=resty-cli-$ver
 
 #################################
 
@@ -703,14 +704,13 @@ rm *.tar.gz
 
 cd ..
 cp $root/util/configure ./ || exit 1
-#markdown2pod -e utf8 -d GitHub $root/README.markdown|$root/util/fix-pod2markdown|pod2text > README || exit 1
 cp $root/README.markdown ./ || exit 1
 cp $root/util/install bundle/ || exit 1
 mkdir util || exit 1
 cp $root/util/package-win32.sh util/ || exit 1
 cp $root/util/build-win32.sh util/ || exit 1
 cp $root/COPYRIGHT ./ || exit 1
-markdown2pod -e utf8 -d GitHub $root/doc/README-win32.md|$root/util/fix-pod2markdown|pod2text > README-win32.txt || exit 1
+perl bundle/$resty_cli/bin/md2pod.pl $root/doc/README-win32.md | pod2text > README-win32.txt || exit 1
 unix2dos README-win32.txt || exit 1
 find bundle -name '*~' -delete