Author: nextgens
Date: 2006-06-17 16:05:51 +0000 (Sat, 17 Jun 2006)
New Revision: 9267
Modified:
trunk/apps/installer/installclasspath/linux/update.sh
Log:
installer: fix recent problems with sha1test
Modified: trunk/apps/installer/installclasspath/linux/update.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/update.sh 2006-06-17
15:58:09 UTC (rev 9266)
+++ trunk/apps/installer/installclasspath/linux/update.sh 2006-06-17
16:05:51 UTC (rev 9267)
@@ -10,6 +10,13 @@
THEMASK="-o /dev/null"
fi
+# see https://bugs.freenetproject.org/view.php?id=223
+# we can't afford a valid non-selfsigned SSL certificate :/
+if [[ $(wget --version | head -n1 | cut -d" " -f3 | cut -d"." -f2) -ge 10 ]]
+then
+ NOCERT="--no-check-certificate "
+fi
+
if [[ ! -x "$(which wget)" ]]
then
WGET=0
@@ -18,12 +25,6 @@
DOWNLOADER3="curl --insecure -q -f -L -O "
else
WGET=1
- # see https://bugs.freenetproject.org/view.php?id=223
- # we can't afford a valid non-selfsigned SSL certificate :/
- if [[ $(wget --version | head -n1 | cut -d" " -f3 | cut -d"." -f2) -ge
10 ]]
- then
- NOCERT="--no-check-certificate "
- fi
DOWNLOADER="wget $THEMASK -N "
DOWNLOADER2="wget $THEMASK -N -i freenet-cvs-snapshot.jar.url"
DOWNLOADER3="wget $THEMASK -N -O update2.sh $NOCERT "
@@ -34,7 +35,13 @@
for x in 1 2 3 4 5
do
echo Downloading sha1test.jar utility jar which will download
the actual update.
- $DOWNLOADER https://emu.freenetproject.org/sha1test.jar
+ if [[ $WGET -eq 1 ]]
+ then
+ $DOWNLOADER $NOCERT
https://emu.freenetproject.org/sha1test.jar
+ else
+ $DOWNLOADER https://emu.freenetproject.org/sha1test.jar
+ fi
+
if [[ -s sha1test.jar ]]
then
break
