From c5cbe120d8fd042b3c10e74be8243ebd4b7bc2da Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 23 Feb 2011 22:58:58 +0000 Subject: [PATCH] [PATCH 1/2] Never write errors to stdout from ipkg-make-index.sh Since the output of ipkg-make-index.sh is unconditionally used to create the Packages file, sending the errors into this file is unacceptable (both because they are not shown to users and because they make an invalid Packages file). For incorrect invocation, write to stderr. For errors from which, send to /dev/null with stdout. Signed-off-by: Kevin Locke git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25677 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- scripts/ipkg-make-index.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh index c4c46f888..8ae7eedc9 100755 --- a/scripts/ipkg-make-index.sh +++ b/scripts/ipkg-make-index.sh @@ -4,11 +4,11 @@ set -e pkg_dir=$1 if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then - echo "Usage: ipkg-make-index " + echo "Usage: ipkg-make-index " >&2 exit 1 fi -which md5sum 2>&1 >/dev/null || alias md5sum=md5 +which md5sum >/dev/null 2>&1 || alias md5sum=md5 for pkg in `find $pkg_dir -name '*.ipk' | sort`; do echo "Generating index for package $pkg" >&2 -- 2.20.1