use ori url

4 files changed, 23 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29170609642a..a661c8d37924 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -5,15 +5,12 @@ pkgbase = morphoj
 	url = https://morphometrics.uk/MorphoJ_page.html
 	arch = x86_64
 	license = Apache License version 2
-	depends = jre-openjdk-headless
-	depends = jre-openjdk
-	depends = jdk-openjdk
-	depends = openjdk-doc
-	depends = openjdk-src
-	source = https://github.com/starsareintherose/morphoj/releases/download/1.07a/MorphoJ.zip
+	depends = java-runtime
+	source = https://morphometrics.uk/MorphoJ_stuff/download.php?get=MorphoJ-installer_Unix_Linux.jar
 	source = MorphoJ.desktop
-	sha256sums = aec7f66e29b0f0171a1e8e585c8720a0b60c4833ffb42066c3cf9e6e0ebf2209
-	sha256sums = 67df0def6fc1832b1fb5ddaa0c9dbfe1ab4d4aac0f1833b6c2bbb51e3f259630
+	source = MorphoJ
+	sha256sums = 73c2555706842eb0a8885c11acce09042feee292a53afe6c9ba74724c6fc5bc4
+	sha256sums = 8d8446303b264ec7da0d8453d80a4ed4310a36248dbe1b5c6a98b174746263c5
+	sha256sums = 06398e7d78d84b6a6a9412379613600fe014cbf2950a0f8aff50e9e90f361165
 
 pkgname = morphoj
-
diff --git a/MorphoJ b/MorphoJ
new file mode 100755
index 000000000000..8560f3e0769a
--- /dev/null
+++ b/MorphoJ
@@ -0,0 +1,3 @@
+#! /bin/sh
+# shell script for launching MorphoJ
+java -Xms128m -Xmx512m -jar /usr/share/morphoj/MorphoJ.jar 
diff --git a/MorphoJ.desktop b/MorphoJ.desktop
index 09d724a0b975..5c6c754b460a 100644
--- a/MorphoJ.desktop
+++ b/MorphoJ.desktop
@@ -3,10 +3,10 @@ Categories=
 Comment=Click to start MorphoJ
 Comment[zh]=Click to start MorphoJ
 Encoding=UTF-8
-Exec=java -jar /usr/share/MorphoJ/MorphoJ.jar
+Exec=java -jar /usr/share/morphoj/MorphoJ.jar
 GenericName=
 GenericName[zh]=
-Icon=/usr/share/MorphoJ/extras/MorphoJ_icon_64.png
+Icon=/usr/share/morphoj/extras/MorphoJ_icon_64.png
 MimeType=
 Name=MorphoJ
 Name[zh]=MorphoJ
diff --git a/PKGBUILD b/PKGBUILD
index bbb803309743..c9d36545170f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Malacology <guoyizhang at malacology dot com>
-# Contributor: Malacology <guoyizhang at malacology dot com>
+# Maintainer: Malacology <guoyizhang at malacology dot net>
+# Contributor: Malacology <guoyizhang at malacology dot net>
 
 pkgname=morphoj
 pkgver=1.07a
@@ -7,70 +7,19 @@ pkgrel=1
 pkgdesc="MorphoJ is an integrated program package for doing geometric morphometrics"
 arch=('x86_64')
 depends=(
-	'jre-openjdk-headless'
-	'jre-openjdk'
-	'jdk-openjdk'
-	'openjdk-doc'
-	'openjdk-src'
+	'java-runtime'
 )
 url="https://morphometrics.uk/MorphoJ_page.html"
 license=('Apache License version 2')
-source=("https://github.com/starsareintherose/morphoj/releases/download/${pkgver}/MorphoJ.zip" "MorphoJ.desktop")
-sha256sums=('aec7f66e29b0f0171a1e8e585c8720a0b60c4833ffb42066c3cf9e6e0ebf2209'
-            '67df0def6fc1832b1fb5ddaa0c9dbfe1ab4d4aac0f1833b6c2bbb51e3f259630')
-
+source=("https://morphometrics.uk/MorphoJ_stuff/download.php?get=MorphoJ-installer_Unix_Linux.jar" "MorphoJ.desktop" "MorphoJ")
+sha256sums=('73c2555706842eb0a8885c11acce09042feee292a53afe6c9ba74724c6fc5bc4'
+            '8d8446303b264ec7da0d8453d80a4ed4310a36248dbe1b5c6a98b174746263c5'
+            '06398e7d78d84b6a6a9412379613600fe014cbf2950a0f8aff50e9e90f361165')
 
 package() {
-
-    mkdir "${pkgdir}/usr"
-    mkdir "${pkgdir}/usr/share"
-    mkdir "${pkgdir}/usr/share/applications"
-    mkdir "${pkgdir}/usr/share/MorphoJ"
-    mkdir "${pkgdir}/usr/share/MorphoJ/extras"
-    mkdir "${pkgdir}/usr/share/MorphoJ/legal"
-    mkdir "${pkgdir}/usr/share/MorphoJ/lib"
-    mkdir "${pkgdir}/usr/share/MorphoJ/resources"
-    
-    install -m 755 ${srcdir}/MorphoJ/MorphoJ.jar ${pkgdir}/usr/share/MorphoJ/MorphoJ.jar
-    
-    install -m 755 ${srcdir}/MorphoJ/extras/MorphoJ_icon_64.png ${pkgdir}/usr/share/MorphoJ/extras/MorphoJ_icon_64.png
-    
-    install -m 755 ${srcdir}/MorphoJ/legal/Apache_LICENSE-2.0.txt ${pkgdir}/usr/share/MorphoJ/legal/Apache_LICENSE-2.0.txt
-    install -m 755 ${srcdir}/MorphoJ/legal/colt_copyright.txt ${pkgdir}/usr/share/MorphoJ/legal/colt_copyright.txt
-    install -m 755 ${srcdir}/MorphoJ/legal/dom4j.LICENSE.txt ${pkgdir}/usr/share/MorphoJ/legal/dom4j.LICENSE.txt
-    install -m 755 ${srcdir}/MorphoJ/legal/LGPL.txt ${pkgdir}/usr/share/MorphoJ/legal/LGPL.txt
-    install -m 755 ${srcdir}/MorphoJ/legal/LICENSE_universalJavaApplicationStub.txt ${pkgdir}/usr/share/MorphoJ/legal/LICENSE_universalJavaApplicationStub.txt
-    
-    install -m 755 ${srcdir}/MorphoJ/lib/avalon-framework-api-4.3.1.jar ${pkgdir}/usr/share/MorphoJ/lib/avalon-framework-api-4.3.1.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/avalon-framework-impl-4.3.1.jar ${pkgdir}/usr/share/MorphoJ/lib/avalon-framework-impl-4.3.1.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-all-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-all-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-anim-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-anim-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-awt-util-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-awt-util-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-bridge-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-bridge-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-css-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-css-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-dom-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-dom-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-ext-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-ext-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-gvt-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-gvt-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-parser-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-parser-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-script-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-script-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-svg-dom-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-svg-dom-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-svggen-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-svggen-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-transcoder-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-transcoder-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-util-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-util-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/batik-xml-1.10.jar ${pkgdir}/usr/share/MorphoJ/lib/batik-xml-1.10.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/colt.jar ${pkgdir}/usr/share/MorphoJ/lib/colt.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/commons-logging-1.2.jar ${pkgdir}/usr/share/MorphoJ/lib/commons-logging-1.2.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/dom4j-2.1.1.jar ${pkgdir}/usr/share/MorphoJ/lib/dom4j-2.1.1.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/fop.jar ${pkgdir}/usr/share/MorphoJ/lib/fop.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/fop-transcoder-allinone-2.2.jar ${pkgdir}/usr/share/MorphoJ/lib/fop-transcoder-allinone-2.2.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/js.jar ${pkgdir}/usr/share/MorphoJ/lib/js.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/swing-layout-1.0.4.jar ${pkgdir}/usr/share/MorphoJ/lib/swing-layout-1.0.4.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/xml-apis-1.3.04.jar ${pkgdir}/usr/share/MorphoJ/lib/xml-apis-1.3.04.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/xml-apis-ext-1.3.04.jar ${pkgdir}/usr/share/MorphoJ/lib/xml-apis-ext-1.3.04.jar
-    install -m 755 ${srcdir}/MorphoJ/lib/xmlgraphics-commons-2.2.jar ${pkgdir}/usr/share/MorphoJ/lib/xmlgraphics-commons-2.2.jar
-
-    install -D -m 755 ${srcdir}/MorphoJ/resources/*.gif "${pkgdir}/usr/share/MorphoJ/resources/"
-    install -D -m 755 ${srcdir}/MorphoJ/resources/*.GIF "${pkgdir}/usr/share/MorphoJ/resources/"
-    
-  install -m 755 ${srcdir}/MorphoJ.desktop ${pkgdir}/usr/share/applications/MorphoJ.desktop
+	mkdir -p $pkgdir/usr/{bin,share/$pkgname}
+	java -DINSTALL_PATH=$pkgdir/usr/share/$pkgname -jar download.php?get=MorphoJ-installer_Unix_Linux.jar -options-system
+	install -Dm755 $srcdir/MorphoJ.desktop $pkgdir/usr/share/applications/MorphoJ.desktop
+	chmod +x $srcdir/MorphoJ
+	install -Dm755 $srcdir/MorphoJ $pkgdir/usr/bin/MorphoJ	
 }