Browse code

Fixed manpage generation script and README

Update md2man script to generate manpages inside docs/man/ directory. Update
usage documentation in the readme to point to the new docs/man path. Update
Ubuntu makefile to use new path to manpages

Docker-DCO-1.1-Signed-off-by: Matthew Heon <mheon@redhat.com> (github: mheon)

Matthew Heon authored on 2014/06/26 01:04:59
Showing 3 changed files
... ...
@@ -51,7 +51,7 @@ saving you from dealing with Pandoc and dependencies on your own computer.
51 51
 
52 52
 ## Building the Fedora / Pandoc image
53 53
 
54
-There is a Dockerfile provided in the `docker/contrib/man/md` directory.
54
+There is a Dockerfile provided in the `docker/docs/man` directory.
55 55
 
56 56
 Using this Dockerfile, create a Docker image tagged `fedora/pandoc`:
57 57
 
... ...
@@ -61,11 +61,11 @@ Using this Dockerfile, create a Docker image tagged `fedora/pandoc`:
61 61
 
62 62
 Once the image is built, run a container using the image with *volumes*:
63 63
 
64
-    docker run -v /<path-to-git-dir>/docker/contrib/man:/pandoc:rw \
65
-    -w /pandoc -i fedora/pandoc /pandoc/md/md2man-all.sh
64
+    docker run -v /<path-to-git-dir>/docker/docs/man:/pandoc:rw \
65
+    -w /pandoc -i fedora/pandoc /pandoc/md2man-all.sh
66 66
 
67 67
 The Pandoc Docker container will process the Markdown files and generate
68
-the man pages inside the `docker/contrib/man/man1` directory using
68
+the man pages inside the `docker/docs/man/man1` directory using
69 69
 Docker volumes. For more information on Docker volumes see the man page for
70 70
 `docker run` and also look at the article [Sharing Directories via Volumes]
71 71
 (http://docs.docker.io/use/working_with_volumes/).
... ...
@@ -17,6 +17,6 @@ for FILE in *.md; do
17 17
 		# skip files that aren't of the format xxxx.N.md (like README.md)
18 18
 		continue
19 19
 	fi
20
-	mkdir -p "../man${num}"
21
-	pandoc -s -t man "$FILE" -o "../man${num}/${name}"
20
+	mkdir -p "./man${num}"
21
+	pandoc -s -t man "$FILE" -o "./man${num}/${name}"
22 22
 done
... ...
@@ -50,7 +50,7 @@ bundle_ubuntu() {
50 50
 	docs/man/md2man-all.sh -q
51 51
 	manRoot="$DIR/usr/share/man"
52 52
 	mkdir -p "$manRoot"
53
-	for manDir in docs/man?; do
53
+	for manDir in docs/man/man?; do
54 54
 		manBase="$(basename "$manDir")" # "man1"
55 55
 		for manFile in "$manDir"/*; do
56 56
 			manName="$(basename "$manFile")" # "docker-build.1"