--- trunk/est-latest.sh	2006/05/07 22:08:45	22
+++ trunk/est-latest.sh	2007/03/09 00:58:26	27
@@ -8,7 +8,7 @@
 	
 	echo "Upstream version of $what is $upstream"
 
-	if echo $usptream | grep 'http://' ; then
+	if echo $upstream | grep 'http://' ; then
 		wget -nc -c $upstream
 	else
 		wget -nc -c http://${what}.sourceforge.net/$upstream
@@ -24,7 +24,7 @@
 	name=`echo $arc | cut -d- -f1`
 	ver=`echo $arc | cut -d- -f2 | sed 's/\.tar.gz//'`
 
-	if dpkg -l "$name" | grep "$ver" 2>&1 >/dev/null ; then
+	if dpkg -l "$name" | grep "^ii" | grep "$ver" 2>&1 >/dev/null ; then
 		echo "Skipping $name [$ver], allready installed."
 		return
 	fi
@@ -38,13 +38,35 @@
 	./configure
 	make
 	sudo checkinstall -y
+
+	# build perl bindings?
+	test -d perlnative && (
+		echo "*** installing native perl bindings"
+		cd perlnative
+		./configure
+		make
+		sudo make install
+	)
+
 	cd $d
 	sudo rm -Rf $tmp
 }
 
-check_upstream 'qdbm'
-extract `ls -d qdbm-*.tar.gz | tail -1`
+dpkg -l | awk '{ print $2 }' | egrep '^lib(estraier|qdbm)' | xargs apt-get remove  -y
 
-check_upstream 'hyperestraier'
-extract `ls -d hyperestraier-*.tar.gz | tail -1`
+qdbm_ver="$1"
+est_ver="$2"
 
+if [ -z "$qdbm_ver" ] ; then
+	check_upstream 'qdbm'
+	extract `ls -d qdbm-*.tar.gz | tail -1`
+else
+	extract `ls -d qdbm-${qdbm_ver}.tar.gz | tail -1`
+fi
+
+if [ -z "$est_ver" ] ; then
+	check_upstream 'hyperestraier'
+	extract `ls -d hyperestraier-*.tar.gz | tail -1`
+else
+	extract `ls -d hyperestraier-${est_ver}.tar.gz | tail -1`
+fi