dir upgrade

2 files changed, 11 insertions, 10 deletions

diff --git a/PKGBUILD b/PKGBUILD
index f37000544680..091ee5540144 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,14 @@
 # installation.
 
 pkgname=jabref-git
-pkgver=5.11.r143.bdee9b6abb
+pkgver=5.11.r155.43364b8b87
 pkgrel=1
 epoch=3
 pkgdesc="GUI frontend for BibTeX, written in Java -- built from git"
 arch=('x86_64')
 url="https://www.jabref.org"
 license=('MIT')
-depends=('java-runtime=21')
+depends=('java-runtime=21' 'xdg-user-dirs' 'gtk3>=3.8' 'alsa-lib')
 makedepends=('git' 'jdk21-openjdk') # tested with openjdk from the repos
 optdepends=('gsettings-desktop-schemas: For web search support')
 provides=('jabref')
@@ -24,7 +24,7 @@ source=("git+https://github.com/JabRef/jabref.git"
 	"${pkgname%-git}.sh")
 sha256sums=('SKIP'
             'cb50a38f701374e6922e74e35c4f99f0418441c48b3c4855e64f0995f0be9cb8'
-            'f17e5184be3541c7c6f54516ee71e0935516c3f36f8c4ecf780999834f88fb0d')
+            'b5936f54b1fd806687171bef46b5be3fa247289e7c63352b448c0922072edcdf')
 
 pkgver() {
   cd ${pkgname%-git}
@@ -34,18 +34,18 @@ pkgver() {
 
 build() {
   # Due to a jlink bug you need at least JDK 21.0.1 to compile JabRef
-  if [[ 0 -gt $(vercmp $(java -version |& sed -n "2s/.*build \([0-9.]*\).*/\1/; 2p") 21.0.1) ]]
+  if [[ 0 -gt $(vercmp $("$JAVA_HOME"/bin/java -version |& sed -n "2s/.*build \([0-9.]*\).*/\1/; 2p") 21.0.1) ]]
   then
     echo "Error: you need JDK at least 21.0.1 to compile Jabref"
     echo "JDK currently in use:"
-    java -version |& sed -n "2p"
+    "$JAVA_HOME"/bin/java -version |& sed -n "2p"
     exit 1
   fi
   cd ${pkgname%-git}
   [[ -d "$srcdir"/gradle ]] && install -d "$srcdir"/gradle
   export GRADLE_USER_HOME="$srcdir"/gradle
   export DEFAULT_JVM_OPTS='"-Xmx1g" "-Xms64m"'
-  pwd
+  # pwd
   ./gradlew --no-daemon -PprojVersion="${pkgver}" \
 	    -PprojVersionInfo="${pkgver}--ArchLinux--${pkgrel}" assemble
   ./gradlew --no-daemon --no-parallel -PprojVersion="${pkgver}" \
@@ -53,12 +53,13 @@ build() {
 }
 
 package() {
-  install -dm755 "${pkgdir}"/usr/share/java/${pkgname}
+  # install -dm755 "${pkgdir}"/usr/share/java/${pkgname}
   install -Dm755 jabref.sh "${pkgdir}"/usr/bin/JabRef
-  install -Dm644 jabref.desktop \
+    install -Dm644 jabref.desktop \
 	  "${pkgdir}"/usr/share/applications/${pkgname}.desktop
 
   cd ${pkgname%-git}
+  # install -Dm755 build/image/bin/JabRef "${pkgdir}"/usr/bin/JabRef
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
   install -Dm644 src/main/resources/icons/jabref.svg \
 	  "${pkgdir}"/usr/share/pixmaps/${pkgname}.svg
@@ -67,5 +68,5 @@ package() {
   ln -sf /usr/bin/JabRef "${pkgdir}"/usr/bin/jabref
 
   install -d "${pkgdir}/opt"
-  cp -R build/image "${pkgdir}"/opt/jabref
+  cp -R build/image "${pkgdir}"/opt/${pkgname}
 }
diff --git a/jabref.sh b/jabref.sh
index e1f7f7c92d54..15ea19fd0cac 100644
--- a/jabref.sh
+++ b/jabref.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-/opt/jabref/bin/JabRef "$@"
+/opt/jabref-git/bin/JabRef "$@"