From 2d36ccae3e834632a69d1f51e627722d7af0b16c Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 29 Dec 2010 10:28:25 -0800 Subject: bash: as a general rule, use read -r This solves cases like bug #350045. --- bin/ebuild-helpers/ecompressdir | 4 ++-- bin/ebuild-helpers/prepallman | 2 +- bin/ebuild-helpers/prepinfo | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin/ebuild-helpers') diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index 7ed2627e3..7a95120a9 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -63,7 +63,7 @@ funk_up_dir() { ((ret|=$?)) find "${dir}" -type l -print0 | \ - while read -d $'\0' brokenlink ; do + while read -r -d $'\0' brokenlink ; do [[ -e ${brokenlink} ]] && continue olddest=$(readlink "${brokenlink}") [[ ${act} == "compress" ]] \ @@ -86,7 +86,7 @@ _relocate_skip_dirs() { [[ -d ${srctree} ]] || return 0 find "${srctree}" -name '*.ecompress.skip' -print0 | \ - while read -d $'\0' src ; do + while read -r -d $'\0' src ; do src=${src%.ecompress.skip} dst="${dsttree}${src#${srctree}}" parent=${dst%/*} diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman index 4568bac1d..574ab6251 100755 --- a/bin/ebuild-helpers/prepallman +++ b/bin/ebuild-helpers/prepallman @@ -10,7 +10,7 @@ hasq "${EAPI}" 0 1 2 3 || exit 0 ret=0 find "${D}" -type d -name man > "${T}"/prepallman.filelist -while read mandir ; do +while read -r mandir ; do mandir=${mandir#${D}} prepman "${mandir%/man}" ((ret|=$?)) diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo index cbbba3ed0..9552923a3 100755 --- a/bin/ebuild-helpers/prepinfo +++ b/bin/ebuild-helpers/prepinfo @@ -23,7 +23,7 @@ if [[ ! -d ${D}${infodir} ]] ; then fi fi -find "${D}${infodir}" -type d -print0 | while read -d $'\0' x ; do +find "${D}${infodir}" -type d -print0 | while read -r -d $'\0' x ; do for f in "${x}"/.keepinfodir*; do [[ -e ${f} ]] && continue 2 done -- cgit v1.2.3-1-g7c22