[arch-commits] Commit in sweethome3d/trunk (PKGBUILD sweethome3d.sh)

[Fabio Castelli]

    Date: Saturday, September 20, 2014 @ 19:38:24
  Author: muflone
Revision: 119330

upgpkg: sweethome3d 4.4-3

sweethome3d 4.4-3

Modified:
  sweethome3d/trunk/PKGBUILD
  sweethome3d/trunk/sweethome3d.sh

----------------+
 PKGBUILD       |    4 ++--
 sweethome3d.sh |   19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-20 17:03:50 UTC (rev 119329)
+++ PKGBUILD	2014-09-20 17:38:24 UTC (rev 119330)
@@ -8,7 +8,7 @@
 
 pkgname=sweethome3d
 pkgver=4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="An interior design application to draw the plan of your house in a 3D environment"
 arch=('any')
 url="http://www.sweethome3d.com/"
@@ -18,7 +18,7 @@
         "${pkgname}.sh"
         "${pkgname}.desktop")
 md5sums=('b4fb46591e84ab5357bc0fd35f025d29'
-         '6e9eca4eb199a6effdc8c2fb8cad1868'
+         '300d70d839309261541e0d33a8173f60'
          'c3455fa8ea4ff1ff6ee130e7d0851dc6')
 install="${pkgname}.install"
 

Modified: sweethome3d.sh
===================================================================
--- sweethome3d.sh	2014-09-20 17:03:50 UTC (rev 119329)
+++ sweethome3d.sh	2014-09-20 17:38:24 UTC (rev 119330)
@@ -1,3 +1,20 @@
 #!/bin/sh
 
-/usr/bin/java -jar /usr/share/java/sweethome3d.jar
+JAVA_EXEC="java"
+if [ -n "$JAVA_HOME" ]; then
+  if [ -x "$JAVA_HOME/bin/java" ]; then
+    echo usa java home
+    JAVA_EXEC="$JAVA_HOME/bin/java"
+  fi
+else
+  echo usa which
+  JAVA_EXEC="$(which java)"
+fi
+
+if [ -z "$JAVA_EXEC" ]; then
+  echo "No 'java' executable can be found, please set JAVA_HOME variable or"
+  echo "use the 'archlinux-java' script to set the Java version."
+  exit 1
+fi
+
+"$JAVA_EXEC" -jar /usr/share/java/sweethome3d.jar