Author: toad
Date: 2008-04-03 14:43:49 +0000 (Thu, 03 Apr 2008)
New Revision: 18955
Modified:
trunk/apps/installer/installclasspath/linux/update.sh
Log:
second arg must be a directory
Modified: trunk/apps/installer/installclasspath/linux/update.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/update.sh 2008-04-03
14:36:58 UTC (rev 18954)
+++ trunk/apps/installer/installclasspath/linux/update.sh 2008-04-03
14:43:49 UTC (rev 18955)
@@ -81,15 +81,23 @@
# and if necessary shutdown the node before replacing, because java may do
wierd things
# otherwise.
-if java $JOPTS -cp sha1test.jar Sha1Test freenet-$RELEASE-latest.jar temp-
+if test -d download-tmp || mkdir download-temp
then
+ echo Created temporary download directory.
+else
+ echo Could not create temporary download directory.
+ exit
+fi
+
+if java $JOPTS -cp sha1test.jar Sha1Test freenet-$RELEASE-latest.jar
download-temp
+then
echo Downloaded freenet-$RELEASE-latest.jar
else
echo Could not download new freenet-$RELEASE-latest.jar.
exit
fi
-if java $JOPTS -cp sha1test.jar Sha1Test freenet-ext.jar temp-
+if java $JOPTS -cp sha1test.jar Sha1Test freenet-ext.jar download-temp
then
echo Downloaded freenet-ext.jar
else
@@ -107,52 +115,53 @@
echo No cmp or md5sum utility detected
echo Restarting the node as we cannot tell whether we need to.
./run.sh stop
- mv temp-freenet-$RELEASE-latest.jar freenet-$RELEASE-latest.jar
+ mv download-temp/freenet-$RELEASE-latest.jar
freenet-$RELEASE-latest.jar
rm freenet.jar
ln -s freenet-$RELEASE-latest.jar freenet.jar
- mv temp-freenet-ext.jar freenet-ext.jar
+ mv download-temp/freenet-ext.jar freenet-ext.jar
./run.sh start
else
- if test "`md5sum freenet.jar`" != "`md5sum
temp-freenet-$RELEASE-latest.jar`"
+ if test "`md5sum freenet.jar`" != "`md5sum
download-temp/freenet-$RELEASE-latest.jar`"
then
echo Restarting node because
freenet-$RELEASE-latest.jar updated.
./run.sh stop
- mv temp-freenet-$RELEASE-latest.jar
freenet-$RELEASE-latest.jar
+ mv download-temp/freenet-$RELEASE-latest.jar
freenet-$RELEASE-latest.jar
rm freenet.jar
ln -s freenet-$RELEASE-latest.jar freenet.jar
- mv temp-freenet-ext.jar freenet-ext.jar
+ mv download-temp/freenet-ext.jar freenet-ext.jar
./run.sh start
- elif test "`md5sum freenet-ext.jar`" != "`md5sum
temp-freenet-ext.jar`"
+ elif test "`md5sum freenet-ext.jar`" != "`md5sum
download-temp/freenet-ext.jar`"
then
echo Restarting node because freenet-ext.jar updated.
./run.sh stop
- mv temp-freenet-ext.jar freenet-ext.jar
+ mv download-temp/freenet-ext.jar freenet-ext.jar
./run.sh restart
fi
fi
else
- if cmp freenet.jar temp-freenet-$RELEASE-latest.jar
+ if cmp freenet.jar download-temp/freenet-$RELEASE-latest.jar
then
# freenet.jar is up to date
- if cmp temp-freenet-ext.jar freenet-ext.jar
+ if cmp download-temp/freenet-ext.jar freenet-ext.jar
echo Your node is up to date
else
echo Restarting node because freenet-ext.jar updated.
./run.sh stop
- mv temp-freenet-ext.jar freenet-ext.jar
+ mv download-temp/freenet-ext.jar freenet-ext.jar
./run.sh start
fi
else
echo Restarting node because freenet-$RELEASE-latest.jar updated
./run.sh stop
- mv temp-freenet-$RELEASE-latest.jar freenet-$RELEASE-latest.jar
+ mv download-temp/freenet-$RELEASE-latest.jar
freenet-$RELEASE-latest.jar
rm freenet.jar
ln -s freenet-$RELEASE-latest.jar freenet.jar
- mv temp-freenet-ext.jar freenet-ext.jar
+ mv download-temp/freenet-ext.jar freenet-ext.jar
./run.sh start
fi
fi
-rm -f temp-freenet-$RELEASE-latest.jar temp-freenet-ext.jar
+rm -f download-temp/freenet-$RELEASE-latest.jar download-temp/freenet-ext.jar
+rmdir download-temp
cd $WHEREAMI
