From 8094c664f64c030c61df33025958db9f8f3ccf89 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Thu, 11 Aug 2016 09:32:56 -0400 Subject: [PATCH] Use -r (--no-run-if-empty) to xargs This avoids false error messages when building packages without ELF files. Fixes #373. --- build-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-package.sh b/build-package.sh index 626fbec34..bed59bbc5 100755 --- a/build-package.sh +++ b/build-package.sh @@ -561,7 +561,7 @@ termux_step_massage () { find . -exec chmod u+w,o-rwx \{\} \; # .. strip binaries (setting them as writeable first) if [ "$TERMUX_DEBUG" = "" ]; then - find . -type f | xargs file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*' + find . -type f | xargs -r file | grep -E "(executable|shared object)" | grep ELF | cut -f 1 -d : | xargs -r $STRIP --strip-unneeded --preserve-dates -R '.gnu.version*' fi # Fix shebang paths: for file in `find -L . -type f`; do @@ -570,7 +570,7 @@ termux_step_massage () { set -e -o pipefail # Remove DT_ entries which the android 5.1 linker warns about: if [ "$TERMUX_DEBUG" = "" ]; then - find . -type f -print0 | xargs -0 $TERMUX_ELF_CLEANER + find . -type f -print0 | xargs -r -0 $TERMUX_ELF_CLEANER fi test ! -z "$TERMUX_PKG_RM_AFTER_INSTALL" && rm -Rf $TERMUX_PKG_RM_AFTER_INSTALL