summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO23
-rw-r--r--PKGBUILD22
-rwxr-xr-ximagej.sh2
3 files changed, 22 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 524256582f4a..ffde6cee6d30 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Mon Jan 8 20:21:39 UTC 2018
pkgbase = imagej
pkgdesc = Image manipulation software for scientists
- pkgver = 1.50i
- pkgrel = 3
+ pkgver = 1.54i
+ pkgrel = 1
epoch = 2
url = https://imagej.net
arch = any
@@ -11,17 +9,16 @@ pkgbase = imagej
makedepends = unzip
depends = java-runtime
optdepends = java-environment-common
- noextract = ij150.zip
- source = http://wsr.imagej.net/distros/cross-platform/ij150.zip
- source = https://wsr.imagej.net/jars/ij150i.jar
+ noextract = ij154.zip
+ source = http://wsr.imagej.net/distros/cross-platform/ij154.zip
+ source = https://repo1.maven.org/maven2/net/imagej/ij/1.54i/ij-1.54i.jar
source = imagej.sh
source = imagej.desktop
source = microscope.xpm
- md5sums = 3defd05424a3e0c99253aec3b6724e95
- md5sums = 8e6b51c27d4ba7c679532ca4b1b30082
- md5sums = 7dc3fd02120f699204b3d85a7e383082
- md5sums = 9d60878b6adad0e1895ce875bf299147
- md5sums = e7a7cef1b44ad3a8752ba63885fd88fb
+ sha256sums = f13e6d39ae0ac1e2635347e47d597df43716f68608221b819226559b8efa2450
+ sha256sums = 4bcdc3ef8e48170c6a3995eb6b11c5d834ab7a0d49b1eab805286b33bf32a6bc
+ sha256sums = c223a3b2437501edd92176f87bbea75d994104e1545eea6c120ef8c774c7114e
+ sha256sums = 799188b0b2cf1dc684dc2f029dbd31a4b44b691b51fd5e42027a994452bc038e
+ sha256sums = fd1479568b116a276ca1f645589a8e37ccaf767736c6cc0dcec9672225a82572
pkgname = imagej
-
diff --git a/PKGBUILD b/PKGBUILD
index df760de956a8..42fa12eadaf1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
# Maintainer: Michael Schubert <mschu.dev at gmail>
# Contributor: Giulio Guzzinati <guzzinati.giulio at gmail>
pkgname=imagej
-pkgver=1.50i # 1.51o in https://wsr.imagej.net/src/, but no binary
-_pkgver=150
-_jar=ij150i.jar
-pkgrel=3
+pkgver=1.54i
+_pkgver=154
+_jar=ij-$pkgver.jar
+pkgrel=1
epoch=2
pkgdesc="Image manipulation software for scientists"
arch=('any')
@@ -14,21 +14,21 @@ depends=('java-runtime')
makedepends=('unzip')
optdepends=('java-environment-common')
source=("http://wsr.imagej.net/distros/cross-platform/ij$_pkgver.zip"
- "https://wsr.imagej.net/jars/$_jar"
+ "https://repo1.maven.org/maven2/net/imagej/ij/$pkgver/$_jar"
"imagej.sh"
"imagej.desktop"
"microscope.xpm")
noextract=("ij$_pkgver.zip")
-md5sums=('3defd05424a3e0c99253aec3b6724e95'
- '8e6b51c27d4ba7c679532ca4b1b30082'
- '7dc3fd02120f699204b3d85a7e383082'
- '9d60878b6adad0e1895ce875bf299147'
- 'e7a7cef1b44ad3a8752ba63885fd88fb')
+sha256sums=('f13e6d39ae0ac1e2635347e47d597df43716f68608221b819226559b8efa2450'
+ '4bcdc3ef8e48170c6a3995eb6b11c5d834ab7a0d49b1eab805286b33bf32a6bc'
+ 'c223a3b2437501edd92176f87bbea75d994104e1545eea6c120ef8c774c7114e'
+ '799188b0b2cf1dc684dc2f029dbd31a4b44b691b51fd5e42027a994452bc038e'
+ 'fd1479568b116a276ca1f645589a8e37ccaf767736c6cc0dcec9672225a82572')
package() {
cd "$pkgdir"
unzip -d "$pkgdir" "$srcdir/ij$_pkgver.zip"
- rm -rf ImageJ/ImageJ.exe ImageJ/ImageJ.app ImageJ/run
+ rm -rf ImageJ/ImageJ.exe ImageJ/ImageJ.app ImageJ/run
mkdir -p "$pkgdir"/usr/share
mv ImageJ "$pkgdir"/usr/share/imagej
diff --git a/imagej.sh b/imagej.sh
index c75c8b19168e..6a84bf69edb7 100755
--- a/imagej.sh
+++ b/imagej.sh
@@ -473,7 +473,7 @@ fi
##################### FINALLY RUN IMAGEJ #####################
-eval java ${java_arch} -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
+eval java -mx${mem}m ${modules} ij.ImageJ -ijpath ${ij_user_path} -port${count} ${images} ${macrocmd} ${macroargs}
exit 0