Author: nextgens
Date: 2008-05-28 13:49:01 +0000 (Wed, 28 May 2008)
New Revision: 20112

Modified:
   trunk/apps/installer/installclasspath/linux/update.sh
Log:
new_installer: remove the md5sum check to sha1test.jar in update.sh

Modified: trunk/apps/installer/installclasspath/linux/update.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/update.sh       2008-05-28 
13:31:28 UTC (rev 20111)
+++ trunk/apps/installer/installclasspath/linux/update.sh       2008-05-28 
13:49:01 UTC (rev 20112)
@@ -70,32 +70,6 @@
                echo Could not download Sha1Test. The servers may be offline?
                exit
        fi
-else
-       # Check the md5sum, if we can. Upgrade old installs, which have a 
sha1test that doesn't support the second argument so cannot do 
download-to-a-temp-dir.
-       if test -x "`which md5sum`"
-       then
-               echo Checking sha1test.jar ...
-               if test "`md5sum sha1test.jar | cut -d ' ' -f 1`" != 
"6a6d76ea75439c2fb7199c2e4c66e49d"
-               then
-                       echo sha1test.jar may be out of date or corrupt, 
attempting to download a new version
-                       cd download-temp
-                       if test $WGET -eq 1
-                       then
-                               $DOWNLOADER $NOCERT 
http://get.freenetproject.org/sha1test.jar
-                       else
-                               $DOWNLOADER 
http://get.freenetproject.org/sha1test.jar
-                       fi
-                       if test "`md5sum sha1test.jar | cut -d ' ' -f 1`" = 
"6a6d76ea75439c2fb7199c2e4c66e49d"
-                       then
-                               echo Downloaded sha1test.jar successfully.
-                               mv sha1test.jar ../sha1test.jar
-                       else
-                               echo Downloaded sha1test.jar but its md5sum is 
bogus.
-                               echo Using old jar.
-                       fi
-                       cd ..
-               fi
-       fi
 fi

 if java $JOPTS -cp sha1test.jar Sha1Test update/update.sh
@@ -124,7 +98,6 @@
        echo Could not download new freenet-$RELEASE-latest.jar.
        exit
 fi
-#ls -l download-temp/freenet-$RELEASE-latest.jar

 if java $JOPTS -cp sha1test.jar Sha1Test freenet-ext.jar download-temp
 then
@@ -133,7 +106,6 @@
        echo Could not download new freenet-ext.jar.
        exit
 fi
-#ls -l download-temp/freenet-ext.jar

 cat wrapper.conf | sed 's/freenet-cvs-snapshot/freenet/g' | sed 
's/freenet-stable-latest/freenet/g' | sed 's/freenet.jar.new/freenet.jar/g' | 
sed 's/freenet-ext.jar.new/freenet-ext.jar/g' > wrapper2.conf
 mv wrapper2.conf wrapper.conf


Reply via email to