2 bug fixes - git not always working and verbose pandoc
Pandoc would output warnings about a lack of title, although we are not using it in the template. Also, the tool would fail to do some git commands because it was checking the wrong folder
This commit is contained in:
parent
6641d61b1f
commit
7a032b7cdb
2 changed files with 4 additions and 2 deletions
|
@ -52,7 +52,7 @@ to-html(){
|
||||||
local newFile="${file##*/}"
|
local newFile="${file##*/}"
|
||||||
newFile="${newFile/.md/.html}"
|
newFile="${newFile/.md/.html}"
|
||||||
sed -E 's/\.md( *)\)/.html\1\)/' "$file" |
|
sed -E 's/\.md( *)\)/.html\1\)/' "$file" |
|
||||||
pandoc -f markdown -t html --template "$templateFile" > "$destination/$newFile"
|
pandoc --quiet -f markdown -t html --template "$templateFile" > "$destination/$newFile"
|
||||||
done
|
done
|
||||||
|
|
||||||
rsync -a \
|
rsync -a \
|
||||||
|
|
4
kb
4
kb
|
@ -330,12 +330,14 @@ mainScript() {
|
||||||
############## Begin Script Here ###################
|
############## Begin Script Here ###################
|
||||||
####################################################
|
####################################################
|
||||||
if [ "${args[0]}" != "init" ]; then
|
if [ "${args[0]}" != "init" ]; then
|
||||||
#cd "$dataDir" || return
|
olddir="$PWD"
|
||||||
|
cd "$dataDir" || return
|
||||||
# Check to see if datadir is a git repo
|
# Check to see if datadir is a git repo
|
||||||
if ! git rev-parse 2> /dev/null; then
|
if ! git rev-parse 2> /dev/null; then
|
||||||
# If not, ensure we don't run git commands
|
# If not, ensure we don't run git commands
|
||||||
dogit=0
|
dogit=0
|
||||||
fi
|
fi
|
||||||
|
cd "$olddir" || return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "${args[0]}" in
|
case "${args[0]}" in
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue