diff options
| author | Andy Chu <andy@oilshell.org> | 2017-10-16 21:19:46 -0700 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-10-19 04:42:15 +0000 |
| commit | 795c311317bf8f68d96053e18e42df522196f328 (patch) | |
| tree | 015cb15d13a801a07c87b9837014ece01f9921d5 /community | |
| parent | 4776604e8265684cd8f52a50ebeba5c90fdfb99d (diff) | |
| download | aports-795c311317bf8f68d96053e18e42df522196f328.tar.bz2 aports-795c311317bf8f68d96053e18e42df522196f328.tar.xz | |
main/xen,community/rng-tools: remove unicode whitespace from APKBUILDs
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'.
Diffstat (limited to 'community')
| -rw-r--r-- | community/rng-tools/APKBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
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 |