diff options
| -rw-r--r-- | eclass/base.eclass | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/eclass/base.eclass b/eclass/base.eclass index be1ee0e5125..90fb9baba3c 100644 --- a/eclass/base.eclass +++ b/eclass/base.eclass @@ -67,8 +67,7 @@ base_src_prepare() { debug-print "$FUNCNAME: PATCHES=$PATCHES" pushd "${S}" > /dev/null - - if declare -p PATCHES >/dev/null 2>&1 && declare -p PATCHES | grep -q '^declare -a '; then + if [[ "$(declare -p PATCHES 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${PATCHES[@]}"; do debug-print "$FUNCNAME: applying patch from ${x}" [[ -f "${x}" ]] && epatch "${x}" @@ -157,13 +156,13 @@ base_src_install_docs() { pushd "${S}" > /dev/null - if declare -p DOCS >/dev/null 2>&1 && declare -p DOCS | grep -q '^declare -a '; then + if [[ "$(declare -p DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${DOCS[@]}"; do debug-print "$FUNCNAME: docs: creating document from ${x}" dodoc -r "${x}" || die "dodoc failed" done fi - if declare -p HTML_DOCS >/dev/null 2>&1 && declare -p HTML_DOCS | grep -q '^declare -a '; then + if [[ "$(declare -p HTML_DOCS 2>/dev/null 2>&1)" == "declare -a"* ]]; then for x in "${HTML_DOCS[@]}"; do debug-print "$FUNCNAME: docs: creating html document from ${x}" dohtml -r "${x}" || die "dohtml failed" |