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

[Fabio Castelli]

    Date: Sunday, July 31, 2022 @ 23:05:42
  Author: muflone
Revision: 1259549

upgpkg: sweethome3d 7.0.2-1

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

----------------+
 PKGBUILD       |    8 ++++----
 sweethome3d.sh |    6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-07-31 22:41:33 UTC (rev 1259548)
+++ PKGBUILD	2022-07-31 23:05:42 UTC (rev 1259549)
@@ -6,8 +6,8 @@
 # Contributor: Archan Paul <paul.archan at gmail.com>
 
 pkgname=sweethome3d
-pkgver=6.6
-pkgrel=4
+pkgver=7.0.2
+pkgrel=1
 pkgdesc="An interior design application to draw the plan of your house in a 3D environment"
 arch=('x86_64')
 url="http://www.sweethome3d.com/"
@@ -18,8 +18,8 @@
         "${pkgname}.sh"
         "${pkgname}.desktop"
         "${pkgname}.xml")
-sha256sums=('0a7557a66a1d9b2a1976a9adece811cb3b8b7838643e1ac04bf0a574533c490b'
-            '6b3ef93a004d05ea083953d651e151af5491f5ca91e00dfd4ec3f0e4e1c87782'
+sha256sums=('f49bff53b69f1baf8bc0f07a221a8b78f8d003aedb3ca7a53fe51cbaf8b306aa'
+            '285bc64c5f79927d1a5e74de17bf5d3c25998d91001506bed27b9e124cf81ad6'
             '5eea3337d956d773b05ddef69fe9d34b940ff550370dc92bf307f1b9a3957f9e'
             'ec0ad1a0671f708af68ced46bec1f4ab377e24ca1a0a9984867ee5fe484f57c5')
 install="${pkgname}.install"

Modified: sweethome3d.sh
===================================================================
--- sweethome3d.sh	2022-07-31 22:41:33 UTC (rev 1259548)
+++ sweethome3d.sh	2022-07-31 23:05:42 UTC (rev 1259549)
@@ -22,7 +22,7 @@
 fi
 
 # Find Java version
-JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')"
+JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | grep ' version ' | head -1 | cut -d' ' -f 3 | tr -d '"')"
 
 # Skip Java versions higher than 16 as Sweethome3D actually is not yet compatible
 # Fallback to any previous version available
@@ -30,7 +30,7 @@
 if [ $(vercmp "${JAVA_VERSION}" "17") -gt 0 ]
 then
   echo "Warning: Sweethome 3D actually is not compatible with Java version > 16"
-  _PREVIOUS_JAVA_VERSION="$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '17-' -m 1)"
+  _PREVIOUS_JAVA_VERSION="$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -vE '17-|18-' -m 1)"
   if [ -z "${_PREVIOUS_JAVA_VERSION}" ]
   then
     echo "No others Java version are available, please install a Java version < 17"
@@ -39,7 +39,7 @@
     echo "Falling back to ${_PREVIOUS_JAVA_VERSION}"
     export JAVA_HOME="/usr/lib/jvm/${_PREVIOUS_JAVA_VERSION}"
     export JAVA_EXEC="${JAVA_HOME}/bin/java"
-    export JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | head -1 | cut -d' ' -f 3 | tr -d '"')"
+    export JAVA_VERSION="$(${JAVA_EXEC} -version 2>&1 | grep ' version ' | head -1 | cut -d' ' -f 3 | tr -d '"')"
   fi
 fi