diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-11-30 17:42:27 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2019-02-06 12:38:05 +0000 |
| commit | 007e1c664c9c8c941158c51f9cee153d0eecc085 (patch) | |
| tree | 3c46bbe55444bbb0fc2ff229a2d8999f2e002270 | |
| parent | b1c96f0abd38a7ca7a038f9b86dc0534d9d7d3bd (diff) | |
| download | aports-007e1c664c9c8c941158c51f9cee153d0eecc085.tar.bz2 aports-007e1c664c9c8c941158c51f9cee153d0eecc085.tar.xz | |
community/openjdk7: modernize
use bash for icedtea-bootstrap
| -rw-r--r-- | community/openjdk7/APKBUILD | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index b7258bf742..f24470a7fd 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -90,14 +90,14 @@ builddir="$srcdir/icedtea-$_icedteaver" unpack() { if [ -z "$force" ]; then - verify || return 1 - initdcheck || return 1 + verify + initdcheck fi mkdir -p "$srcdir" msg "Unpacking sources..." - tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz || return 1 - tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1 - unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir" || return 1 + tar -C "$srcdir" -zxf icedtea-$_icedteaver.tar.gz + tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz + unzip -o -q "rhino-$RHINO_VER.zip" -d "$srcdir" } prepare() { @@ -113,7 +113,7 @@ prepare() { ;; *.patch) msg "Applying patch $patch" - patch -p1 -i "$srcdir"/$patch || return 1 + patch -p1 -i "$srcdir"/$patch ;; esac done @@ -172,18 +172,17 @@ build() { --with-langtools-src-zip=$srcdir/langtools-$_dropsver.tar.bz2 \ --with-pax=paxmark \ --with-jdk-home=$BOOTSTRAP_JAVA_HOME \ - --with-pkgversion="Alpine ${pkgver}-r${pkgrel}" \ - || return 1 + --with-pkgversion="Alpine ${pkgver}-r${pkgrel}" msg "Icedtea boot" - make -j1 icedtea-boot || return 1 + make -j1 icedtea-boot SHELL=/bin/bash msg "Icedtea boot done" - make || return 1 + make } package() { mkdir -p "$pkgdir"/$INSTALL_BASE - cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE || return 1 + cp -a "$builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE rm "$pkgdir"/$INSTALL_BASE/src.zip # pax mark again (due to fakeroot xattr handling bug) @@ -205,7 +204,7 @@ jrelib() { local dirname=${A%/*} mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname - mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname || return 1 + mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done } @@ -217,11 +216,11 @@ jrebase() { local A; for A in java orbd rmid servertool unpack200 keytool \ pack200 rmiregistry tnameserv; do - mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin || return 1 + mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin done # rest of the jre subdir (which were not taken by -jre subpkg) - mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE || return 1 + mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE # pax mark again (due to fakeroot xattr handling bug) "$builddir"/pax-mark-vm "$subpkgdir"/$INSTALL_BASE @@ -241,7 +240,7 @@ jre() { local dirname=${A%/*} mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname - mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname || return 1 + mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname done # pax mark again (due to fakeroot xattr handling bug) @@ -249,8 +248,7 @@ jre() { } doc() { - default_doc || return 1 - + default_doc mkdir -p "$subpkgdir"/$INSTALL_BASE/ mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/ } |