better versioning

3 files changed, 70 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4fcfed0fede5..1e875c9bd127 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pharo
 	pkgdesc = a fork of Squeak, an implementation of the object-oriented, dynamically typed, reflective programming language Smalltalk
-	pkgver = 4.0
-	pkgrel = 2
+	pkgver = 4.0.615
+	pkgrel = 1
 	url = http://www.pharo-project.org/
 	arch = i686
 	arch = x86_64
@@ -13,9 +13,15 @@ pkgbase = pharo
 	depends = nas
 	depends = dbus-core
 	depends = libxml2
-	source = http://files.pharo.org/platform/Pharo4.0-linux.zip
+	source = http://files.pharo.org/vm/pharo/linux/stable.zip
+	source = http://files.pharo.org/image/40/40615.zip
+	source = http://files.pharo.org/media/logo/icon-512x512.png
+	source = pharo.sh
 	source = pharo.desktop
-	md5sums = b8cc96d9963b66f1d1486f47794db87a
+	md5sums = 5031fa155741e745e629070134f08b9a
+	md5sums = 4ae3df0ac2c3f84346e7976b2fa8264b
+	md5sums = 6424f4db069bf43aefd3f3fae673e4a6
+	md5sums = 24050a25113d7b5d28557d2a99b1ad19
 	md5sums = 1447999d37a6d87ddddc2f99d9781bbc
 
 pkgname = pharo
diff --git a/PKGBUILD b/PKGBUILD
index f668ec923b3c..f688e36d2431 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Daniel Milde <daniel@milde.cz>
 
 pkgname=pharo
-pkgver=4.0
-pkgrel=3
+pkgver=4.0.615
+pkgrel=1
 pkgdesc="a fork of Squeak, an implementation of the object-oriented, dynamically typed, reflective programming language Smalltalk"
 arch=(i686 x86_64)
 url="http://www.pharo-project.org/"
@@ -14,17 +14,32 @@ else
 	depends=('alsa-lib' 'libvorbis' 'pango' 'mesa' 'nas' 'dbus-core' 'libxml2')
 fi
 
-source=(http://files.pharo.org/platform/Pharo${pkgver}-linux.zip $pkgname.desktop)
+imageversion=${pkgver//./}
 
-md5sums=('5ffa099bcfe774e4a2cbd5e5807c4ebe'\
-		'1447999d37a6d87ddddc2f99d9781bbc')
+source=(http://files.pharo.org/vm/pharo/linux/stable.zip \
+	http://files.pharo.org/image/40/${imageversion}.zip\
+	http://files.pharo.org/media/logo/icon-512x512.png\
+	$pkgname.sh
+	 $pkgname.desktop)
+
+md5sums=('5031fa155741e745e629070134f08b9a'\
+	'4ae3df0ac2c3f84346e7976b2fa8264b'\
+	'6424f4db069bf43aefd3f3fae673e4a6'\
+	'24050a25113d7b5d28557d2a99b1ad19'\
+	'1447999d37a6d87ddddc2f99d9781bbc')
 
 package() {
-	cd $srcdir/pharo${pkgver}/
-	mkdir -p $pkgdir/opt/pharo
+	cd $srcdir
+	unzip stable.zip -d bin
+
+	mkdir -p $pkgdir/opt/pharo/shared
 	mkdir -p $pkgdir/usr/bin
 
-	cp -fr $srcdir/pharo${pkgver}/* $pkgdir/opt/pharo
+	cp -R bin $pkgdir/opt/pharo
+	install $pkgname.sh $pkgdir/opt/pharo/pharo
+	install Pharo-${imageversion}.changes $pkgdir/opt/pharo/shared/Pharo4.0.changes
+	install Pharo-${imageversion}.image $pkgdir/opt/pharo/shared/Pharo4.0.image
+
 	chgrp -R users $pkgdir/opt/pharo/
 	chmod -R 755 $pkgdir/opt/pharo
 
@@ -34,7 +49,7 @@ package() {
 	mkdir -p $pkgdir/usr/share/pixmaps
 	mkdir -p $pkgdir/usr/share/applications
 
-	cp $srcdir/pharo${pkgver}/icons/Pharo.png $pkgdir/usr/share/pixmaps/$pkgname.png
+	install icon-512x512.png $pkgdir/usr/share/pixmaps/$pkgname.png
 
 	install -D -m644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 }
diff --git a/pharo.sh b/pharo.sh
new file mode 100755
index 000000000000..edc400d0cce0
--- /dev/null
+++ b/pharo.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# path
+DIR=`readlink -f $0` #resolve symlink
+ROOT=`dirname $DIR` #obtain dir of the resolved path
+LINUX="$ROOT/bin"
+RESOURCES="$ROOT/shared"
+ICONS="$ROOT/icons"
+
+# icon (note: gvfs-set-attribute is found in gvfs-bin on Ubuntu
+# systems and it seems to require an absolute filename)
+gvfs-set-attribute \
+	"$0" \
+	"metadata::custom-icon" \
+	"file://$ICONS/Pharo.png" \
+		2> /dev/null
+
+# zenity is part of GNOME
+image_count=`ls "$RESOURCES"/*.image 2>/dev/null |wc -l`
+if [ "$1" == "" ]; then 
+	if which zenity &>/dev/null && [ "$image_count"  -ne 1 ]; then
+		image=`zenity --title 'Select an image' --file-selection --filename "$RESOURCES/" --file-filter '*.image' --file-filter '*'`
+	else
+		image="$RESOURCES/Pharo4.0.image"		
+	fi
+else
+	image=$*
+fi
+
+
+# execute
+exec "$LINUX/pharo" \
+	--plugins "$LINUX" \
+	--encoding utf8 \
+	-vm-display-X11 \
+	$image
\ No newline at end of file