ExternalVendorCode/mo
1
0
Fork 0
mirror of https://github.com/tests-always-included/mo.git synced 2024-12-18 16:27:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move file loading to a separate function

Browse Source
This commit is contained in:
Tyler Akins 2015-01-23 18:06:24 +00:00
parent 7a271b58f6
commit b097733ffd
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mo
View File

@ -104,8 +104,7 @@ mustache-parse() {
# Execute in subshell to preserve current cwd
(
cd "$(dirname "$MUSTACHE_TAG")"
MUSTACHE_TAG=$(basename "$MUSTACHE_TAG")
MUSTACHE_TAG=$(cat "$MUSTACHE_TAG" 2>/dev/null)
mustache-load-file MUSTACHE_TAG "${MUSTACHE_TAG##*/}"
mustache-parse MUSTACHE_TAG "$MUSTACHE_TAG" "" "$MUSTACHE_CURRENT"
echo -n $MUSTACHE_TAG
)
@ -339,18 +338,34 @@ mustache-get-content() {
CONTENT=""
for FILENAME in ${1+"$@"}; do
# This is so relative paths work from inside template files
CONTENT="$CONTENT"'{{>'"$FILENAME"'}}'
done
else
# Workaround to avoid newlines being gobbled by the subshell
CONTENT="$(cat -; echo .)"
CONTENT=${CONTENT:0: -1}
mustache-load-file CONTENT /dev/stdin
fi
local "$TARGET" && mustache-indirect "$TARGET" "$CONTENT"
}
# Read a file
#
# Parameters:
# $1: Variable name to receive the file's content
# $2: Filename to load
mustache-load-file() {
local CONTENT
# The subshell removes any trailing newlines. We forcibly add
# a dot to the content to preserve all newlines.
CONTENT="$(cat $2; echo '.')"
CONTENT="${CONTENT:0: -1}" # Remove last dot
local "$1" && mustache-indirect "$1" "$CONTENT"
}
# Save the list of functions as an array
MUSTACHE_FUNCTIONS=$(declare -F)
MUSTACHE_FUNCTIONS=( ${MUSTACHE_FUNCTIONS//declare -f /} )