gen: more fixes to output

1 files changed, 8 insertions, 3 deletions

diff --git a/gen.sh b/gen.sh
index d2cf21c..847ce78 100755
--- a/gen.sh
+++ b/gen.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env sh
 
 WORKDIR=$PWD
-OUTDIR=/var/www/blog/
+OUTDIR=/var/www/blog
 verbose=0 # Variables to be evaluated as shell arithmetic should be initialized to a default or validated beforehand.
 
 if [ ! "$(command -v lowdown)" ]; then
@@ -84,19 +84,25 @@ EOF
 # Make out dir
 if [ ! -d "${OUTDIR}" ]; then mkdir ${OUTDIR} ; fi
 
+# Remove posts and drafts if present
+if [ -d "${OUTDIR}/posts" ]; then rm -rf "${OUTDIR}/posts" ; fi
+if [ -d "${OUTDIR}/draft" ]; then rm -rf "${OUTDIR}/draft" ; fi
+
 MDLIST=$(eval "find ${WORKDIR} -type f -name \"*.md\" ")
 for m in $MDLIST; do
 	# shortpath trims the working directory prefix
         shortpath=$(eval "echo $m | sed -e 's,${WORKDIR}/,,' ")
 
         BNAME=$(eval "basename $m")
-        dirpath=$(eval "echo $m | sed -e 's,${WORKDIR}/,,' -e 's,${BNAME},,' ")
+        dirpath=$(eval "dirname $shortpath")
         filename=$(eval "echo ${BNAME} | sed -e 's,\.md,,' ")
 	if [ $verbose -gt 0 ]; then
 		echo "Processing: ${shortpath}"
 	fi
 
+
 	OUTPATH="${OUTDIR}/${dirpath}/${filename}.html"
+        if [ ! -d "${OUTDIR}/${dirpath}" ]; then mkdir -p "${OUTDIR}/${dirpath}" ; fi
 	
 	# Output directly to file if $dirpath ends in ".md" for root-level files
 	case $dirpath in *.md)
@@ -105,7 +111,6 @@ for m in $MDLIST; do
 
 	*)
 	# Make the outdir if not ending in ".md"
-	if [ ! -d "${OUTDIR}/${dirpath}" ]; then mkdir ${OUTDIR}/${dirpath} ; fi
 	esac
 	
 	echo $HEADER > "${OUTPATH}"