From 795c311317bf8f68d96053e18e42df522196f328 Mon Sep 17 00:00:00 2001 From: Andy Chu Date: Mon, 16 Oct 2017 21:19:46 -0700 Subject: main/xen,community/rng-tools: remove unicode whitespace from APKBUILDs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix bugs in 2 packages by removing Unicode whitespace. I found these problems by parsing all APKBUILD scripts with my shell (http://www.oilshell.org/). The problem only occurs if 'make' fails. Here is an excerpt: $ od -c unicode-space.sh 0000000 m a k e | | 302 240 r e t u r n 0000020 1 \n 0000022 \302 \204 is a utf-8 whitespace. No shells accept this -- it's parsed as part of the 'return' word, which makes it an invalid command. $ busybox ash unicode-space.sh make: *** No targets specified and no makefile found. Stop. unicode-space.sh: line 1:  return: not found $ bash unicode-space.sh make: *** No targets specified and no makefile found. Stop. unicode-space.sh: line 1:  return: command not found $ dash unicode-space.sh make: *** No targets specified and no makefile found. Stop. unicode-space.sh: 1: unicode-space.sh:  return: not found Remove '|| return 1' from lines that contained unicode whitespace. abuild now runs with 'set -e'. --- community/rng-tools/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'community') diff --git a/community/rng-tools/APKBUILD b/community/rng-tools/APKBUILD index 83d0de3d84..93442b5f45 100644 --- a/community/rng-tools/APKBUILD +++ b/community/rng-tools/APKBUILD @@ -27,12 +27,12 @@ build() { --libexecdir=/usr/lib/rng-tools \ --sysconfdir=/etc \ --disable-silent-rules - make || return 1 + make } package() { cd "$builddir" - make DESTDIR="${pkgdir}" install || return 1 + make DESTDIR="${pkgdir}" install install -m644 -D "${srcdir}/rngd.confd" "${pkgdir}/etc/conf.d/rngd" || return 1 install -m755 -D "${srcdir}/rngd.initd" "${pkgdir}/etc/init.d/rngd" || return 1 -- cgit v1.2.3