--- trunk/est-latest.sh	2007/03/09 00:58:26	27
+++ trunk/est-latest.sh	2007/05/26 23:16:58	29
@@ -13,6 +13,8 @@
 	else
 		wget -nc -c http://${what}.sourceforge.net/$upstream
 	fi
+	
+	upstream_ver=`echo $upstream | cut -d- -f2 | sed 's/\.tar.gz//'`
 }
 
 d=`pwd`
@@ -32,6 +34,13 @@
 	mkdir $tmp
 	cd $tmp
 
+	opt=""
+	if [ "$name" == "qdbm" ] ; then
+		opt="--enable-gzip"
+		echo "remove current hyperestraier because we will rebuild qdbm..."
+		sudo apt-get remove -y hyperestraier
+	fi
+
 	echo "Extracting $name [$ver] to $tmp"
 	tar xvfz "$d/$arc"
 	cd *
@@ -52,21 +61,21 @@
 	sudo rm -Rf $tmp
 }
 
-dpkg -l | awk '{ print $2 }' | egrep '^lib(estraier|qdbm)' | xargs apt-get remove  -y
+dpkg -l | awk '{ print $2 }' | egrep '^lib(estraier|qdbm)' | xargs sudo apt-get remove  -y
 
 qdbm_ver="$1"
 est_ver="$2"
 
 if [ -z "$qdbm_ver" ] ; then
 	check_upstream 'qdbm'
-	extract `ls -d qdbm-*.tar.gz | tail -1`
+	extract "qdbm-${upstream_ver}.tar.gz"
 else
-	extract `ls -d qdbm-${qdbm_ver}.tar.gz | tail -1`
+	extract `ls -m qdbm-${qdbm_ver}.tar.gz | head -1`
 fi
 
 if [ -z "$est_ver" ] ; then
 	check_upstream 'hyperestraier'
-	extract `ls -d hyperestraier-*.tar.gz | tail -1`
+	extract "hyperestraier-${upstream_ver}.tar.gz"
 else
-	extract `ls -d hyperestraier-${est_ver}.tar.gz | tail -1`
+	extract `ls -m hyperestraier-${est_ver}.tar.gz | head -1`
 fi