cleanup

1 files changed, 17 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 91d3d69500a4..90fa6547e882 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,38 +18,48 @@ case "$CARCH" in
     armv?h) _arch='aarch32hf'
         _build=11.43.100
         sha256sums=('48523ca1f3e0e3308ada108a0a6e84dee057017e0a06b81f5da722c769a5766a')
+        source=(${source:-"https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_${_arch}.tar.gz"})
         ;;
     aarch64) _arch='aarch64'
         _build=11.43.100
         sha256sums=('15f9e3512b2c011a33c36b4ff27a8e70fefc18805509d5d58b0bd3b6684cbe8e')
+        source=(${source:-"https://cdn.azul.com/zulu-embedded/bin/zulu${_build}-ca-jdk${pkgver}-linux_${_arch}.tar.gz"})
         ;;
     i686) _arch='i686'
         _build=11.43.55
         sha256sums=('804d1307527903023c91396035b36a0ca74c7ddd8905835e1820b321ccc7c216')
         source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_i686.tar.gz")
-        provides=("java-environment=11" "java-runtime=11")
         ;;
     x86_64) _arch='x64'
         _build=11.43.55
         sha256sums=('6c79bfe8bb06c82b72ef2f293a14becef56b3078d298dc75fda4225cbb2d3d0c')
         source=("https://cdn.azul.com/zulu/bin/zulu${_build}-ca-jdk${pkgver}-linux_x64.tar.gz")
-        provides=("java-environment=11" "java-runtime=11")
 esac
 
-_archive="zulu${_build}-ca-jdk${pkgver}-linux_${_arch}"
-source=(${source:-"https://cdn.azul.com/zulu-embedded/bin/${_archive}.tar.gz"})
-
+_archive=${source[0]/.tar.gz/}
 _jvmdir="usr/lib/jvm/zulu-embedded-${pkgver%%.*}"
 
 package() {
-    cd "$_archive"
+    cd "$(basename $_archive)"
 
     install -dm 755 "${pkgdir}/${_jvmdir}"
     cp -a . "${pkgdir}/${_jvmdir}/"
 
+    # Conf
+    install -dm 755 "${pkgdir}/etc"
+    cp -r conf "${pkgdir}/etc/${pkgname}"
+    rm -rf "${pkgdir}/${_jvmdir}/conf"
+    ln -s "/etc/${pkgname}" "${pkgdir}/${_jvmdir}/conf"
+
+    # Legal
+    install -dm 755 "${pkgdir}/usr/share/licenses"
+    cp -r legal "${pkgdir}/usr/share/licenses/${pkgname}"
+    rm -rf "${pkgdir}/${_jvmdir}/legal"
+    ln -s "/usr/share/licenses/${pkgname}" "${pkgdir}/${_jvmdir}/legal"
+
     # Man pages
     for f in man/man1/*; do
-      install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-zulu.1}"
+        install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-zulu11.1}"
     done
     rm -rf "${pkgdir}/${_jvmdir}/man"
     ln -s /usr/share/man "${pkgdir}/${_jvmdir}/man"