diff --git a/make.sh b/make.sh index 14aa4ba..bf0e052 100755 --- a/make.sh +++ b/make.sh @@ -1,10 +1,11 @@ # compiles new post into target directory +rootDir='./_site/' post() { # check directory existence if [ -f markdown/post/$1 ] then - # compile the new post and drop it in ./post/ - pandoc markdown/post/$1 --css bstyle.css -s -o post/${1%.*}.html + # CSS file is always relative to the target html location + pandoc markdown/post/$1 --css style.css -s -o post/${1%.*}.html else # error message incase file was not found echo "File \"$1\" not found in markdown/post" @@ -12,18 +13,24 @@ post() { } updatestyle() { - # make sure that all sub styles are kept up to date with the root stylesheet - cp style.css ./page/bstyle.css - sed -i 's/.\/fonts/..\/fonts/g' ./page/bstyle.css - cp style.css ./post/bstyle.css - sed -i 's/.\/fonts/..\/fonts/g' ./page/bstyle.css + # Updating index style + cp style.css $rootDir/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/style.css + + # Updating page style + cp style.css $rootDir/page/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css + + # Updating post style + cp style.css $rootDir/post/style.css + sed -i 's/.\/fonts/..\/fonts/g' $rootDir/page/style.css } page() { # we want to enforce maintainence of directory structure if [ -f markdown/pages/$1 ] then - pandoc markdown/pages/$1 --css bstyle.css -s -o page/${1%.*}.html + pandoc markdown/pages/$1 --css style.css -s -o $rootDir/page/${1%.*}.html else echo "File \"$1\" not found in markdown/pages" fi @@ -32,19 +39,19 @@ page() { # literally just updates the index file nothing else index() { # base index file - pandoc ./markdown/index.md --css style.css -s -o index.html # typing succs + pandoc ./markdown/index.md --css style.css -s -o $rootDir/index.html # typing succs # next we inject the navbar html stuff - sed -i '7r ./templates/navbar.html' index.html + sed -i '7r ./templates/navbar.html' $rootDir/index.html } -# taking function names as para +# taking function names as param "$@" if [ -z $1 ] then echo './make.sh post file.md - make new post' - echo './make.sh updatestyle - update & sync style sheets' + echo './make.sh updatestyle - update & sync style sheets' echo './make.sh page file.md - make new page' - echo './make.sh index - update index' + echo './make.sh index - update index' fi