diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-08-05 22:09:04 +0200 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-08-05 22:30:22 +0200 |
| commit | 7d6864ae69f6c99e7d4e7131b64ad10dbd433ca0 (patch) | |
| tree | abe7549d9337f63f93ab29eca1bddbc0c21da05a /main/nginx | |
| parent | 8a7ee641f4a14b6a9b3402426ae78d7abde7e75b (diff) | |
| download | aports-7d6864ae69f6c99e7d4e7131b64ad10dbd433ca0.zip | |
main/nginx: remove explicit return 1
Diffstat (limited to 'main/nginx')
| -rw-r--r-- | main/nginx/APKBUILD | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 608dbd04634..f77a7c472a8 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -177,10 +177,9 @@ build() { --with-stream_geoip_module=dynamic \ --with-stream_ssl_preread_module \ \ - $_extra_flags \ - || return 1 + $_extra_flags - make || return 1 + make } check() { @@ -192,22 +191,20 @@ check() { package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install # Disable some PaX protections; this is needed for Lua module. local paxflags="-m" [ "$CARCH" = "x86" ] && paxflags="-msp" - paxmark $paxflags "$pkgdir"/usr/sbin/nginx || return 1 + paxmark $paxflags "$pkgdir"/usr/sbin/nginx install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE install -Dm644 README "$pkgdir"/usr/share/doc/$pkgname/README - install -Dm644 objs/$pkgname.8 \ - "$pkgdir"/usr/share/man/man8/$pkgname.8 || return 1 + install -Dm644 objs/$pkgname.8 "$pkgdir"/usr/share/man/man8/$pkgname.8 local name; for name in ngx_devel_kit lua-nginx-module nginx-rtmp-module; do - cp -r "$srcdir"/$name-*/doc* \ - "$pkgdir"/usr/share/doc/$pkgname/$name || return 1 + cp -r "$srcdir"/$name-*/doc* "$pkgdir"/usr/share/doc/$pkgname/$name done cd "$pkgdir" @@ -223,7 +220,7 @@ package() { install -dm755 -g $_grp_www ./var/www/localhost/htdocs install -dm755 ./var/log - mv ./var/lib/$pkgname/logs ./var/log/$pkgname || return 1 + mv ./var/lib/$pkgname/logs ./var/log/$pkgname ln -sf /$_modules_dir ./var/lib/$pkgname/modules ln -sf /var/log/$pkgname ./var/lib/$pkgname/logs @@ -257,7 +254,7 @@ _module() { mkdir -p "$subpkgdir"/$_modules_dir cd "$subpkgdir" - mv "$pkgdir"/$_modules_dir/$soname ./$_modules_dir/$soname || return 1 + mv "$pkgdir"/$_modules_dir/$soname ./$_modules_dir/$soname mkdir -p "$subpkgdir"/etc/nginx/modules echo "load_module \"modules/$soname\";" > ./etc/nginx/modules/$name.conf |