diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2017-04-04 17:55:50 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-05 10:30:44 +0000 |
| commit | c95263d877ca3ed953de0a114b2c1ccb9aa04b65 (patch) | |
| tree | 86766c6b87d8b7f6ab5dd4c1d9c64d04fa18af48 /newapkbuild.in | |
| parent | ecc1f509c6d469223cfbf4ef3f7c574de286ba6e (diff) | |
| download | abuild-c95263d877ca3ed953de0a114b2c1ccb9aa04b65.tar.gz abuild-c95263d877ca3ed953de0a114b2c1ccb9aa04b65.tar.bz2 abuild-c95263d877ca3ed953de0a114b2c1ccb9aa04b65.tar.xz abuild-c95263d877ca3ed953de0a114b2c1ccb9aa04b65.zip | |
remove explicit `|| return 1` from all sample APKBUILDs
Those statement are no longer needed because abuild now runs with
`set -e` by default.
See also: 36d5193776180385a39626a83241822736a5f6b8
Diffstat (limited to 'newapkbuild.in')
| -rw-r--r-- | newapkbuild.in | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/newapkbuild.in b/newapkbuild.in index c021db5..bbe7a44 100644 --- a/newapkbuild.in +++ b/newapkbuild.in @@ -33,7 +33,7 @@ is_github_url() { # Build sections build_make() { cat >>APKBUILD<<__EOF__ - make || return 1 + make __EOF__ } @@ -45,9 +45,8 @@ build_autotools() { --prefix=/usr \\ --sysconfdir=/etc \\ --mandir=/usr/share/man \\ - --localstatedir=/var \\ - || return 1 - make || return 1 + --localstatedir=/var + make __EOF__ } @@ -71,29 +70,28 @@ build_cmake() { -DCMAKE_BUILD_TYPE=Release \\ -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\ -DCMAKE_C_FLAGS="\$CFLAGS" \\ - ${CMAKE_CROSSOPTS} \\ - || return 1 - make || return 1 + ${CMAKE_CROSSOPTS} + make __EOF__ } build_perl() { cat >>APKBUILD<<__EOF__ - PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor || return 1 - make || return 1 + PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor + make __EOF__ } build_python() { cat >>APKBUILD<<__EOF__ - python setup.py build || return 1 + python setup.py build __EOF__ } # Package sections package_make() { cat >>APKBUILD<<__EOF__ - make DESTDIR="\$pkgdir" install || return 1 + make DESTDIR="\$pkgdir" install __EOF__ } @@ -103,14 +101,14 @@ package_autotools() { package_perl() { cat >>APKBUILD<<__EOF__ - make DESTDIR="\$pkgdir" install || return 1 + make DESTDIR="\$pkgdir" install find "\$pkgdir" \\( -name perllocal.pod -o -name .packlist \\) -delete __EOF__ } package_python() { cat >>APKBUILD<<__EOF__ - python setup.py install --prefix=/usr --root="\$pkgdir" || return 1 + python setup.py install --prefix=/usr --root="\$pkgdir" __EOF__ } @@ -273,9 +271,9 @@ __EOF__ cat >>APKBUILD<<__EOF__ install -m755 -D "\$srcdir"/\$pkgname.initd \\ - "\$pkgdir"/etc/init.d/\$pkgname || return 1 + "\$pkgdir"/etc/init.d/\$pkgname install -m644 -D "\$srcdir"/\$pkgname.confd \\ - "\$pkgdir"/etc/conf.d/\$pkgname || return 1 + "\$pkgdir"/etc/conf.d/\$pkgname __EOF__ fi cat >>APKBUILD<<__EOF__ |