From 24e928472a1e9def98378c1ad3c06b9232b599cd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 19 Dec 2010 19:33:26 -0800 Subject: Substitute bash builtin >> for touch command. It should be faster to use the bash builtin, and also allows us to avoid issues with touch breakage (like in bug #348640). --- bin/ebuild-helpers/ecompress | 7 +++++-- bin/ebuild-helpers/ecompressdir | 9 ++++++--- bin/ebuild-helpers/prepstrip | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'bin/ebuild-helpers') diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress index ed19ffb1b..de81b4484 100755 --- a/bin/ebuild-helpers/ecompress +++ b/bin/ebuild-helpers/ecompress @@ -95,8 +95,11 @@ case $1 in ;; --queue) shift - touch "${@/%/.ecompress.file}" - ret=$? + ret=0 + for x in "${@/%/.ecompress.file}" ; do + >> "$x" + ((ret|=$?)) + done [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret ;; diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir index acdb1cd7f..7ed2627e3 100755 --- a/bin/ebuild-helpers/ecompressdir +++ b/bin/ebuild-helpers/ecompressdir @@ -14,7 +14,7 @@ case $1 in shift for skip in "$@" ; do [[ -d ${D}${skip} || -f ${D}${skip} ]] \ - && touch "${D}${skip}.ecompress.skip" + && >> "${D}${skip}.ecompress.skip" done exit 0 ;; @@ -22,8 +22,11 @@ case $1 in shift set -- "${@/%/.ecompress.dir}" set -- "${@/#/${D}}" - touch "$@" - ret=$? + ret=0 + for x in "$@" ; do + >> "$x" + ((ret|=$?)) + done [[ $ret -ne 0 ]] && helpers_die "${0##*/} failed" exit $ret ;; diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip index ceb1ef047..8b18ac0c8 100755 --- a/bin/ebuild-helpers/prepstrip +++ b/bin/ebuild-helpers/prepstrip @@ -188,6 +188,6 @@ then # https://bugzilla.redhat.com/show_bug.cgi?id=444310 while read -r -d $'\0' emptydir do - touch "$emptydir"/.keepdir + >> "$emptydir"/.keepdir done < <(find "${D}${prepstrip_sources_dir}/" -type d -empty -print0) fi -- cgit v1.2.3-1-g7c22