utilizes offline resources, added icon

5 files changed, 26 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6c1ab431c8d3..e236f8b2d07d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = molecular-workbench
 	pkgdesc = Modeling tool for designing and conducting computational experiments across science.
 	pkgver = 3.0.0
-	pkgrel = 1
+	pkgrel = 4
 	url = http://mw.concord.org
-	arch = i686
-	arch = x86_64
+	arch = any
 	license = CCPL
-	depends = java
-	source = http://mw2.concord.org/public/lib/mw.jar
-	source = mw.sh
+	depends = java-environment
+	depends = bash
+	source = http://mw.concord.org/modeler/cd.zip
+	source = molecular-workbench.png
+	source = molecular-workbench
 	source = molecular-workbench.desktop
-	md5sums = 1ec169630beb8d8b298c850fd6eb3797
-	md5sums = 83070b0d60c30a00db87ae7bbf36487a
+	md5sums = 064455ffeae68820721276f679699dc0
+	md5sums = f75e594817e24d18beadfbc500132ea7
+	md5sums = 76f5f16a79562d8a50372acb0280f941
 	md5sums = 784c824346606bd1c49b5e504b97a118
 
 pkgname = molecular-workbench
diff --git a/PKGBUILD b/PKGBUILD
index 2005bca436bb..00a0dd2c93fe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,26 +1,28 @@
-# Maintainer: Josh Hoffer < hoffer dot joshua at gmail dot com > 
+#Maintainer: Josh Hoffer < hoffer dot joshua at gmail dot com > 
 
 pkgname=molecular-workbench
 pkgdesc='Modeling tool for designing and conducting computational experiments across science.'
 pkgver=3.0.0
-pkgrel=3
+pkgrel=4
 arch=('any')
 url="http://mw.concord.org"
 license=(CCPL)
 depends=('java-environment' 'bash')
-source=("http://mw2.concord.org/public/lib/mw.jar"
-	"mw.sh"
-	"molecular-workbench.desktop")
-
-md5sums=('1ec169630beb8d8b298c850fd6eb3797'
-         '83070b0d60c30a00db87ae7bbf36487a'
+source=("http://mw.concord.org/modeler/cd.zip"
+	"$pkgname.png"
+	"$pkgname"
+	"$pkgname.desktop")
+md5sums=('064455ffeae68820721276f679699dc0'
+         'f75e594817e24d18beadfbc500132ea7'
+         '76f5f16a79562d8a50372acb0280f941'
          '784c824346606bd1c49b5e504b97a118')
 
 package() {
 	cd "$srcdir"
-	install -Dm 0644 mw.jar "$pkgdir/usr/share/java/mw/mw.jar"
-	install -Dm 0644 mw.sh "$pkgdir/usr/bin/molecular-workbench"
+	install -Dm 0644 cd/mw.jar "$pkgdir/usr/share/java/$pkgname/mw.jar"
+	cp -r cd/CC-MW-CD "$pkgdir/usr/share/java/$pkgname/CC-MW-CD"
+	install -Dm 0755 $pkgname "$pkgdir/usr/bin/$pkgname"
 	install -Dm 0644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-#	install -Dm 0644 logo_48x48x32.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+	install -Dm 0644 $pkgname.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
diff --git a/molecular-workbench b/molecular-workbench
new file mode 100644
index 000000000000..0d95516f36ed
--- /dev/null
+++ b/molecular-workbench
@@ -0,0 +1,3 @@
+#!/bin/sh
+BASE="/usr/share/java/molecular-workbench"
+java -jar -Dmw.cd.mode=true $BASE/mw.jar remote $BASE/CC-MW-CD/cd.cml
diff --git a/molecular-workbench.png b/molecular-workbench.png
new file mode 100644
index 000000000000..e7e2037cdb4c
--- /dev/null
+++ b/molecular-workbench.png
diff --git a/mw.sh b/mw.sh
deleted file mode 100644
index 5a4215b94d7b..000000000000
--- a/mw.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-java -jar /usr/share/java/mw/mw.jar