[arch-commits] Commit in pdfsam/trunk (PKGBUILD pdfsam)

[Evgeniy Alekseev]

    Date: Tuesday, February 23, 2016 @ 01:11:58
  Author: arcanis
Revision: 163156

upgpkg: pdfsam 3.0.1-4
try to use specified java environment version, see FS#48256 for details

Added:
  pdfsam/trunk/pdfsam
Modified:
  pdfsam/trunk/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 pdfsam   |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-23 00:01:22 UTC (rev 163155)
+++ PKGBUILD	2016-02-23 00:11:58 UTC (rev 163156)
@@ -5,7 +5,7 @@
 pkgname=pdfsam
 pkgver=3.0.1
 _pkgver=3.0.1.RELEASE
-pkgrel=3
+pkgrel=4
 pkgdesc="A free open source tool to split and merge pdf documents"
 arch=('any')
 url="http://www.pdfsam.org/"
@@ -14,9 +14,11 @@
 makedepends=('desktop-file-utils' 'gendesk')
 optdepends=('java-openjfx: required if openjdk is used')
 source=("https://github.com/torakiki/${pkgname}/releases/download/v${_pkgver}/${pkgname}-${_pkgver}-bin.zip"
+        "pdfsam"
         "pdfsam.png")
 install="${pkgname}.install"
 md5sums=('c637a48637e142ac9901e2bd069ce9d2'
+         'e98c7828d1d8b4fdb7ba76c0e0f180db'
          '033e0e52c29624ce31d86b8a8b43adb6')
 
 prepare() {
@@ -40,8 +42,7 @@
                  "${pkgdir}/usr/share/java/${pkgname}/resources/splash.gif"
 
   # exec
-  install -dm755 "${pkgdir}/usr/bin/"
-  ln -s "/usr/share/java/pdfsam/bin/pdfsam.sh" "${pkgdir}/usr/bin/pdfsam"
+  install -Dm755 "pdfsam" "${pkgdir}/usr/bin/pdfsam"
 
   # desktop
   install -Dm644 "pdfsam.png" "${pkgdir}/usr/share/pixmaps/pdfsam.png"

Added: pdfsam
===================================================================
--- pdfsam	                        (rev 0)
+++ pdfsam	2016-02-23 00:11:58 UTC (rev 163156)
@@ -0,0 +1,36 @@
+#!/bin/sh
+# run application with java env >= 8
+
+PDFSAM_EXECUTABLE="/usr/share/java/pdfsam/bin/pdfsam.sh"
+PDFSAM_JAVA_VERSION="8"
+
+run_pdfsam() {
+    exec "${PDFSAM_EXECUTABLE}"
+    exit 0
+}
+
+# check JAVA_HOME first
+if test ! -z "${JAVA_HOME}"; then
+    if test "${JAVA_HOME#*$PDFSAM_JAVA_VERSION}" != "${JAVA_HOME}"; then
+        # system environment variable set to required, do nothing
+        echo "Using java environment from JAVA_HOME: ${JAVA_HOME}" >&2
+        run_pdfsam
+    else
+        # unset JAVA_HOME
+        echo "Unset JAVA_HOME for this run: ${JAVA_HOME}" >&2
+        unset JAVA_HOME
+    fi
+fi
+
+# check current environment
+if archlinux-java status | grep "default" | grep -q "${PDFSAM_JAVA_VERSION}"; then
+    # required java version is set to default, do nothing
+    echo "Using system enabled java environment" >&2
+    run_pdfsam
+fi
+
+# find valid environment
+PDFSAM_JAVA_ENV="`archlinux-java status | grep "${PDFSAM_JAVA_VERSION}" | awk '{ print $1 }'`"
+export PATH="/usr/lib/jvm/${PDFSAM_JAVA_ENV}/jre/bin/:${PATH}"
+echo "Run with exported ${PDFSAM_JAVA_ENV}" >&2
+run_pdfsam