fix cache updating script

diff --git a/net-p2p/gift-gnutella/Manifest b/net-p2p/gift-gnutella/Manifest
index 3855f2db2e4ef86bf68905a60490e38ef926a797..c82f81762e78683a49783d9c8f2381a345e11d99 100644 (file)
--- a/net-p2p/gift-gnutella/Manifest
+++ b/net-p2p/gift-gnutella/Manifest
@@ -6,11 +6,11 @@ MD5 7cec74b0299b882dc3eea20601c330a3 ChangeLog 2616
 MD5 875f23093b78af2d864a7a7ba464f126 metadata.xml 223
 MD5 c464f118c813212dd2f6e7ddbfd0bef4 files/digest-gift-gnutella-0.0.9.2 74
 MD5 3a2b71fe09957a425acb0f40be079266 files/gift-gnutella-gcc35.patch 457
-MD5 0a5373ad71a58a55c2f66b39c845be66 files/cacheupdate.sh 842
+MD5 87a8f04b6651ae553a4b3943d537392d files/cacheupdate.sh 837
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBgp07cAgAdbxYsnERAvnEAJsGKelRSbWvguoweraGDrD6M9luJgCffvPp
-80CTgiTrpaCrEXDFzVVGvng=
-=ZlEu
+iD8DBQFBqMWecAgAdbxYsnERAjxPAKChFR7MTRDrQFg+vKeusBuZzMaxuwCgqMG0
+Znz4IIT7Uh2V2kg08hxmbKY=
+=cL31
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/gift-gnutella/files/cacheupdate.sh b/net-p2p/gift-gnutella/files/cacheupdate.sh
index 85f3e45a3aeaf961e6832675cf0bf3806fab42c7..64f70fff51d162ec8eec69b1f7562f974cde8784 100644 (file)
--- a/net-p2p/gift-gnutella/files/cacheupdate.sh
+++ b/net-p2p/gift-gnutella/files/cacheupdate.sh
@@ -1,20 +1,22 @@
 #!/bin/bash
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/files/cacheupdate.sh,v 1.6 2004/10/29 19:42:42 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gift-gnutella/files/cacheupdate.sh,v 1.7 2004/11/27 18:21:00 squinky86 Exp $
 
 if [ -d ~/.giFT/Gnutella/ ]; then
        cd ~/.giFT/Gnutella
-       wget http://loot.alumnigroup.org/?get=1\&hostfile=1\&net=gnutella2\&client=GEN2\&version=0.1 -O gwebcaches.new || die "Unable to retrieve new caches."
-       grep "u|" gwebcaches.new > gwebcaches.new1
-       sed -i -e 's:u|::g' gwebcaches.new1
-       sed -i -e 's:|.*::g' gwebcaches.new1
-       mv gwebcaches.new1 gwebcaches
-       grep "h|" gwebcaches.new | grep -v "ph|" > nodes.new
-       sed -i -e 's:h|::g' nodes.new
-       sed -i -e 's:|.*::g' nodes.new
-       mv nodes.new nodes
-       rm gwebcaches.new
+       wget http://crab.bishopston.net:3558/?urlfile=1\&client=GEN2\&version=0.2 -O gwebcaches.new || die "Unable to retrieve new caches."
+       if [ "`grep ERROR gwebcaches.new`" ]; then
+               cat gwebcaches.new
+       else
+               mv gwebcaches.new gwebcaches
+       fi
+       wget http://crab.bishopston.net:3558/?hostfile=1\&client=GEN2\&version=0.2 -O nodes.new || die "Unable to retrieve new hosts."
+       if [ "`grep ERROR nodes.new`" ]; then
+               cat nodes.new
+       else
+               mv nodes.new nodes
+       fi
        echo "Update complete!"
 else
        echo "Please emerge gift-gnutella and run gift-setup."