diff options
author | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 11:18:39 -0700 |
---|---|---|
committer | Mark Ferrell <major@homeonderanged.org> | 2014-04-15 11:18:39 -0700 |
commit | c6672da7bb06ecd6541b50353855ad658136428f (patch) | |
tree | 0914648ec73247634efce314eb8d45b052b1720d | |
parent | 255ad46edd3d42537b62605162a7cc1a9e44ee4b (diff) |
Cleanup quoting in include/import
-rwxr-xr-x | build | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -77,10 +77,10 @@ import() { set -- "${1}" "`echo "${1}" | tr '-' '_'`" test -f "${BUILDER_LIBDIR}/${1}" || die "library does not exist '${1}'" - eval "test -z '\${BUILDER_IMPORT_${2}}'" || return + eval "test -z \"\${BUILDER_IMPORT_${2}}\"" || return BUILDER_CALL_STASH="${BUILDER_CALL_STACK}" BUILDER_CALL_STACK="${BUILDER_CALL_STACK} ${1}" . "${BUILDER_CALL_LIBDIR}/${1}" - eval "BUILDER_IMPORT_${2}='${BUILDER_LIBDIR}/${1}" + eval "BUILDER_IMPORT_${2}='${BUILDER_LIBDIR}/${1}'" if [ -z "${BUILDER_IMPORTED}" ]; then BUILDER_IMPORTED="${1}" else @@ -96,9 +96,9 @@ include() { set -- "${1}" "`echo "${1}" | tr '-' '_'`" test -f "${BUILDER_CFGDIR}/${1}" || die "config not found '${1}'" - eval "test -z '\${BUILDER_INCLUDE_${2}}'" || return + eval "test -z \"\${BUILDER_INCLUDE_${2}}\"" || return . "${BUILDER_CFGDIR}/${1}" - eval "BUILDER_INCLUDE_${2}='${BUILDER_CFGDIR}/${1}" + eval "BUILDER_INCLUDE_${2}='${BUILDER_CFGDIR}/${1}'" if [ -z "${BUILDER_INCLUDED}" ]; then BUILDER_INCLUDED="${1}" else |