diff --git a/sw b/sw index c470565..29a8604 100755 --- a/sw +++ b/sw @@ -8,18 +8,18 @@ sw_filter() { } sw_main() { - $MDHANDLER $1 + $MDHANDLER "$1" } sw_menu() { echo "" @@ -42,17 +42,17 @@ _header_

-${TITLE} ${SUBTITLE} +${TITLE} ${SUBTITLE}

_header_ # Menu echo "
" - sw_menu $1 + sw_menu "$1" echo "
" # Body echo "
" - sw_main $1 + sw_main "$1" echo "
" # Footer cat << _footer_ @@ -65,16 +65,16 @@ _footer_ } sw_style() { - if [ -f $CDIR/$STYLE ]; then + if [ -f "$CDIR/$STYLE" ]; then echo '' fi } # Set input dir -IDIR="`echo $1 | sed -e 's,/*$,,'`" -if [ -z "$IDIR" ] || [ ! -d $IDIR ]; then +IDIR="$(echo $1 | sed -e 's,/*$,,')" +if [ -z "$IDIR" ] || [ ! -d "$IDIR" ]; then echo "Usage: sw [dir]" exit 1 fi @@ -88,19 +88,19 @@ fi # Setup output dir structure CDIR=$PWD -ODIR="$CDIR/`basename $IDIR`.static" -rm -rf $ODIR -mkdir -p $ODIR -cp -rf $IDIR/* $ODIR -rm -f `find $ODIR -type f -iname '*.md'` +ODIR="$CDIR/$(basename $IDIR).static" +rm -rf "$ODIR" +mkdir -p "$ODIR" +cp -rf $IDIR/* "$ODIR" +rm -f $(find "$ODIR" -type f -iname '*.md') #TODO: can't find do that? # Parse files -cd $IDIR -FILES=`find . -iname '*.md' | sed -e 's,^\./,,'` +cd "$IDIR" || exit 1 +FILES=$(find . -iname '*.md' | sed -e 's,^\./,,') for a in $FILES; do - b="$ODIR/`echo $a | sed -e 's,.md$,.html,g'`" + b="$ODIR/$(echo $a | sed -e 's,.md$,.html,g')" echo "* $a" - sw_page $a > $b; + sw_page "$a" > "$b" done exit 0