diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-12-30 01:21:56 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-12-30 01:21:56 +0000 |
| commit | 3fbd4f658d90f04d4bcc24337d37ddb21e842900 (patch) | |
| tree | ce7fd536ce23dcdba6627c8253d5641369d41475 /bin/misc-functions.sh | |
| parent | Send stuff that's not a warning or error to stdout rather than stderr. (diff) | |
| download | portage-multirepo-3fbd4f658d90f04d4bcc24337d37ddb21e842900.tar.gz portage-multirepo-3fbd4f658d90f04d4bcc24337d37ddb21e842900.tar.bz2 portage-multirepo-3fbd4f658d90f04d4bcc24337d37ddb21e842900.zip | |
fixup style
svn path=/main/trunk/; revision=5417
Diffstat (limited to 'bin/misc-functions.sh')
| -rwxr-xr-x | bin/misc-functions.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index 7246b45e..23e17b3e 100755 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -187,12 +187,14 @@ install_qa_check() { rm -f "${D}/usr/share/info/dir.gz" fi - if hasq multilib-strict ${FEATURES} && [ -x /usr/bin/file -a -x /usr/bin/find -a \ - -n "${MULTILIB_STRICT_DIRS}" -a -n "${MULTILIB_STRICT_DENY}" ]; then - local abort=no firstrun=yes + if hasq multilib-strict ${FEATURES} && \ + [[ -x /usr/bin/file && -x /usr/bin/find ]] && \ + [[ -n ${MULTILIB_STRICT_DIRS} && -n ${MULTILIB_STRICT_DENY} ]] + then + local abort=no firstrun=yes MULTILIB_STRICT_EXEMPT=$(echo ${MULTILIB_STRICT_EXEMPT} | sed -e 's:\([(|)]\):\\\1:g') - for dir in ${MULTILIB_STRICT_DIRS}; do - [ -d "${D}/${dir}" ] || continue + for dir in ${MULTILIB_STRICT_DIRS} ; do + [[ -d ${D}/${dir} ]] || continue for file in $(find ${D}/${dir} -type f | grep -v "^${D}/${dir}/${MULTILIB_STRICT_EXEMPT}"); do if file ${file} | egrep -q "${MULTILIB_STRICT_DENY}" ; then if [[ ${firstrun} == yes ]] ; then |