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

[Evgeniy Alekseev]

    Date: Thursday, October 26, 2017 @ 12:49:04
  Author: arcanis
Revision: 264506

upgpkg: pdfsam 3.3.4-1

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

----------+
 PKGBUILD |    6 +++---
 pdfsam   |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-26 12:15:12 UTC (rev 264505)
+++ PKGBUILD	2017-10-26 12:49:04 UTC (rev 264506)
@@ -3,7 +3,7 @@
 # Contributor: Tom <reztho at archlinux dot us>
 
 pkgname=pdfsam
-pkgver=3.3.3
+pkgver=3.3.4
 pkgrel=1
 pkgdesc="A free open source tool to split and merge pdf documents"
 arch=('any')
@@ -43,6 +43,6 @@
   install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }
 
-sha512sums=('4d031f7165622cf16afebcf5acd5e3948845b183cf3b09f9f384c3c47ccb2c613d55526da36ee438547988293b96f76ab76a48a431b6c160995d7c6ead34c260'
-            '2e797fe4d7b8ae18003cd3098cffd97b1a6025c32603bfda7fd53a12e9664198f69d90e6802f7aff79c7d629008b4d00978f9266bc2ae75ba48af64161ad4641'
+sha512sums=('4e3e5c61ed828a9a140c4bbaf8e28fecbb17cb8f721879f35393e7d30c3869c0403b8d56f0eff77a2608f30933c3a4deb5e018a484f670df5057ebd18f9fbfd8'
+            '89b66081b761fd392550339c3ca04c9af828528355ded8aa4a8c6f94988010a5b44c3c1bfb2042c37113a1c764344ffba9ebf888a528d02ba36cbac29ad1a936'
             '219c3b78b1246103ca6c0b4b50f23a38f994458f54ddfdd37058df33587e258bbe0c3b7f0866dc3d10e657c9425a8b3be915ef6a09a2401e937ac50315653dfb')

Modified: pdfsam
===================================================================
--- pdfsam	2017-10-26 12:15:12 UTC (rev 264505)
+++ pdfsam	2017-10-26 12:49:04 UTC (rev 264506)
@@ -2,7 +2,7 @@
 # run application with java env >= 8
 
 PDFSAM_EXECUTABLE="/usr/share/java/pdfsam/bin/pdfsam.sh"
-PDFSAM_JAVA_VERSION="8"
+PDFSAM_JAVA_VERSION="8\|9"
 
 run_pdfsam() {
     exec "${PDFSAM_EXECUTABLE}"
@@ -10,8 +10,8 @@
 }
 
 # check JAVA_HOME first
-if test ! -z "${JAVA_HOME}"; then
-    if test "${JAVA_HOME#*$PDFSAM_JAVA_VERSION}" != "${JAVA_HOME}"; then
+if test -n "${JAVA_HOME}"; then
+    if echo ${JAVA_HOME} | grep -q "${PDFSAM_JAVA_VERSION}"; then
         # system environment variable set to required, do nothing
         echo "Using java environment from JAVA_HOME: ${JAVA_HOME}" >&2
         run_pdfsam
@@ -31,6 +31,6 @@
 
 # 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}"
+export PATH="/usr/lib/jvm/${PDFSAM_JAVA_ENV%/*}/jre/bin/:${PATH}"
 echo "Run with exported ${PDFSAM_JAVA_ENV}" >&2
 run_pdfsam