Author: nextgens
Date: 2007-05-09 23:52:54 +0000 (Wed, 09 May 2007)
New Revision: 13185
Added:
trunk/apps/new_installer/offline/
trunk/apps/new_installer/offline/offline
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/cleanup.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
trunk/apps/new_installer/res/unix/bin/install_frost.sh
trunk/apps/new_installer/res/unix/bin/install_jSite.sh
trunk/apps/new_installer/res/unix/bin/install_librarian.sh
trunk/apps/new_installer/res/unix/bin/install_mdns.sh
trunk/apps/new_installer/res/unix/bin/install_stun.sh
trunk/apps/new_installer/res/unix/bin/install_thaw.sh
trunk/apps/new_installer/res/unix/bin/install_updater.sh
trunk/apps/new_installer/res/unix/bin/setup.sh
trunk/apps/new_installer/res/windows/bin/cleanup.cmd
trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd
trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd
trunk/apps/new_installer/res/windows/bin/install_frost.cmd
trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
trunk/apps/new_installer/res/windows/bin/install_updater.cmd
trunk/apps/new_installer/res/windows/bin/setup.cmd
Log:
new_installer: allow offline operations
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2007-05-09 23:17:46 UTC (rev
13184)
+++ trunk/apps/new_installer/install.xml 2007-05-09 23:52:54 UTC (rev
13185)
@@ -136,6 +136,13 @@
<exclude name="*/**/.svn/**"/>
<include name="*/**"/>
</fileset>
+
+ <fileset dir="offline" targetdir="$INSTALL_PATH">
+ <exclude name="*/**/.svn"/>
+ <exclude name="*/**/.svn/**"/>
+ <include name="*/**"/>
+ </fileset>
+
<executable
targetfile="$INSTALL_PATH\bin\remove_service.bat" keep="true"
stage="uninstall"/>
<parsable targetfile="$INSTALL_PATH\bin\cleanup.cmd"/>
<parsable
targetfile="$INSTALL_PATH\bin\install_freenet-ext.cmd"/>
@@ -159,6 +166,12 @@
<include name="*/**"/>
</fileset>
+ <fileset dir="offline" targetdir="$INSTALL_PATH">
+ <exclude name="*/**/.svn"/>
+ <exclude name="*/**/.svn/**"/>
+ <include name="*/**"/>
+ </fileset>
+
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/setup.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/setup.sh"/>
@@ -188,6 +201,12 @@
<include name="*/**"/>
</fileset>
+ <fileset dir="offline" targetdir="$INSTALL_PATH">
+ <exclude name="*/**/.svn"/>
+ <exclude name="*/**/.svn/**"/>
+ <include name="*/**"/>
+ </fileset>
+
<executable targetfile="$INSTALL_PATH/run.sh"
type="bin" stage="never" keep="true"/>
<executable targetfile="$INSTALL_PATH/bin/setup.sh"
type="bin" stage="never"/>
<parsable targetfile="$INSTALL_PATH/bin/setup.sh"/>
Added: trunk/apps/new_installer/offline/offline
===================================================================
Modified: trunk/apps/new_installer/res/unix/bin/cleanup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/cleanup.sh 2007-05-09 23:17:46 UTC
(rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2007-05-09 23:52:54 UTC
(rev 13185)
@@ -5,4 +5,4 @@
cd "$INSTALL_PATH"
# We keep application installers in case users want to perform updates
-rm -f 1run.sh cleanup.sh detect_port_availability.sh install_freenet-ext.sh
install_freenet-stable-latest.sh install_librarian.sh install_mdns.sh
install_plugins.sh install_stun.sh install_updater.sh setup.sh
install_startup_hook-mac.sh
+rm -f 1run.sh cleanup.sh detect_port_availability.sh install_freenet-ext.sh
install_freenet-stable-latest.sh install_librarian.sh install_mdns.sh
install_plugins.sh install_stun.sh install_updater.sh setup.sh
install_startup_hook-mac.sh offline
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-05-09 23:52:54 UTC (rev 13185)
@@ -4,5 +4,8 @@
cd "$INSTALL_PATH"
-echo "Downloading freenet-ext.jar"
-java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" &>/dev/null || exit
1
+if test ! -e offline
+then
+ echo "Downloading freenet-ext.jar"
+ java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" &>/dev/null
|| exit 1
+fi
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-05-09 23:52:54 UTC (rev 13185)
@@ -4,7 +4,11 @@
cd "$INSTALL_PATH"
-echo "Downloading freenet-stable-latest.jar"
-java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
&>/dev/null || exit 1
+if test ! -e offline
+then
+ echo "Downloading freenet-stable-latest.jar"
+ java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
&>/dev/null || exit 1
+fi
+
rm -f freenet.jar
ln -sf freenet-stable-latest.jar freenet.jar 2>&1 >/dev/null
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -7,8 +7,11 @@
if test -e frost
then
rm -f frost
- echo "Downloading frost"
- java -jar bin/sha1test.jar frost/frost.zip ./ &>/dev/null || exit 1
+ if test ! -e offline
+ then
+ echo "Downloading frost"
+ java -jar bin/sha1test.jar frost/frost.zip ./ &>/dev/null ||
exit 1
+ fi
echo "Unzipping frost"
mkdir frost
java -jar bin/uncompress.jar frost.zip frost &>/dev/null
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -7,6 +7,9 @@
if test -e jsite
then
rm -f jsite
- echo "Downloading jSite"
- java -jar bin/sha1test.jar jSite/jSite.jar ./ &>/dev/null || exit 1
+ if test ! -e offline
+ then
+ echo "Downloading jSite"
+ java -jar bin/sha1test.jar jSite/jSite.jar ./ &>/dev/null ||
exit 1
+ fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -11,7 +11,10 @@
PLUGINS=`cat plug`
echo "plugins.Librarian.Librarian at
file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS" > plug2
mv -f plug2 plug
- java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
+ if test ! -e offline
+ then
+ java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins
&>/dev/null
+ fi
mv plugins/Librarian.jar.url plugins/Librarian.jar
rm -f plugins/Librarian.jar.url
rm -f librarian
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -11,7 +11,10 @@
PLUGINS=`cat plug`
echo "plugins.MDNSDiscovery.MDNSDiscovery at
file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS" > plug2
mv -f plug2 plug
- java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url plugins
&>/dev/null
+ if test ! -e offline
+ then
+ java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins &>/dev/null
+ fi
mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
rm -f plugins/MDNSDiscovery.jar.url
rm -f mdns
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -11,7 +11,10 @@
PLUGINS=`cat plug`
echo "plugins.JSTUN.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS" > plug2
mv -f plug2 plug
- java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins &>/dev/null
+ if test ! -e offline
+ then
+ java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
&>/dev/null
+ fi
mv plugins/JSTUN.jar.url plugins/JSTUN.jar
rm -f plugins/JSTUN.jar.url
rm -f stun
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -7,6 +7,9 @@
if test -e thaw
then
rm -f thaw
- echo "Downloading Thaw"
- java -jar bin/sha1test.jar Thaw/Thaw.jar ./ &>/dev/null || exit 1
+ if test ! -e offline
+ then
+ echo "Downloading Thaw"
+ java -jar bin/sha1test.jar Thaw/Thaw.jar ./ &>/dev/null || exit
1
+ fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-05-09
23:52:54 UTC (rev 13185)
@@ -13,6 +13,9 @@
rm -f update
fi
-echo "Downloading update.sh"
-java -jar bin/sha1test.jar update/update.sh "$INSTALL_PATH" &>/dev/null ||
exit 1
+if test ! -e offline
+then
+ echo "Downloading update.sh"
+ java -jar bin/sha1test.jar update/update.sh "$INSTALL_PATH" &>/dev/null
|| exit 1
+fi
chmod a+rx "$INSTALL_PATH/update.sh"
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2007-05-09 23:17:46 UTC
(rev 13184)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2007-05-09 23:52:54 UTC
(rev 13185)
@@ -15,3 +15,11 @@
# We need the exec flag on /bin
chmod u+x bin/*sh bin/wrapper-* lib/* &>/dev/null
+
+# Are we in offline mode ?
+if test -e offline
+then
+ echo "Offline installation mode"
+else
+ echo "Online installation mode"
+fi
Modified: trunk/apps/new_installer/res/windows/bin/cleanup.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2007-05-09
23:52:54 UTC (rev 13185)
@@ -5,4 +5,4 @@
:: Keep application installers in case users want to perform updates
@cd bin
- at del /F 1run.cmd setup.cmd detect_port_availability.cmd
install_freenet-ext.cmd install_freenet-stable-latest.cmd install_plugins.cmd
install_updater.cmd install_wrapper.cmd setup.cmd 2> NUL > NUL
+ at del /F 1run.cmd setup.cmd detect_port_availability.cmd
install_freenet-ext.cmd install_freenet-stable-latest.cmd install_plugins.cmd
install_updater.cmd install_wrapper.cmd setup.cmd offline 2> NUL > NUL
Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd
2007-05-09 23:52:54 UTC (rev 13185)
@@ -3,5 +3,7 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
+ at if not exist offline goto end
@echo "Downloading freenet-ext.jar"
@java -jar bin\sha1test.jar freenet-ext.jar . > NUL
+:end
Modified:
trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd
2007-05-09 23:52:54 UTC (rev 13185)
@@ -3,6 +3,8 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
+ at if not exist offline goto end
@echo "Downloading freenet-stable-latest.jar"
@java -jar bin\sha1test.jar freenet-stable-latest.jar . > NUL
+:end
@copy freenet-stable-latest.jar freenet.jar > NUl
Modified: trunk/apps/new_installer/res/windows/bin/install_frost.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-05-09
23:52:54 UTC (rev 13185)
@@ -5,8 +5,10 @@
@if not exist frost goto nofrost
@del /F frost > NUL
+ at if not exist offline goto end
@echo "Downloading Frost"
@java -jar bin\sha1test.jar frost/frost.zip . > NUL
+:end
@echo "Setting Frost up"
@mkdir frost
@java -jar bin\uncompress.jar frost.zip frost > NUL
Modified: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-05-09
23:52:54 UTC (rev 13185)
@@ -5,7 +5,9 @@
@if not exist jsite goto nojsite
@del /F jsite > NUL
+ at if not exist offline goto end
@echo "Downloading jSite"
+ at java -jar bin\sha1test.jar jSite/jSite.jar . > NUL
+:end
@echo @start javaw -jar jSite.jar > jsite.cmd
- at java -jar bin\sha1test.jar jSite/jSite.jar . > NUL
:nojsite
Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd
2007-05-09 23:52:54 UTC (rev 13185)
@@ -10,7 +10,9 @@
@if not exist stun goto nostun
@echo -JSTUN
@set PLUGINS=plugins.JSTUN.JSTUN at
file:///%INSTALL_PATH%\plugins\JSTUN.jar;%PLUGINS%
+ at if not exist offline goto end1
@java -jar bin\sha1test.jar plugins/JSTUN.jar.url plugins > NUL
+:end1
@copy plugins\JSTUN.jar.url plugins\JSTUN.jar > NUL
@del /F stun > NUL
:nostun
@@ -18,7 +20,9 @@
@if not exist mdns goto nomdns
@echo -MDNSDiscovery
@set PLUGINS=plugins.MDNSDiscovery.MDNSDiscovery at
file:///%INSTALL_PATH%\plugins\MDNSDiscovery.jar;%PLUGINS%
+ at if not exist offline goto end2
@java -jar bin\sha1test.jar plugins/MDNSDiscovery.jar.url plugins > NUL
+:end2
@copy plugins\MDNSDiscovery.jar.url plugins\MDNSDiscovery.jar > NUL
@del /F mdns > NUL
:nomdns
@@ -26,7 +30,9 @@
@if not exist librarian goto nolibrarian
@echo -Librarian
@set PLUGINS=plugins.Librarian.Librarian at
file:///%INSTALL_PATH%\plugins\Librarian.jar;%PLUGINS%
+ at if not exist offline goto end3
@java -jar bin\sha1test.jar plugins/Librarian.jar.url plugins > NUL
+:end3
@copy plugins\Librarian.jar.url plugins\Librarian.jar > NUL
@del /F librarian > NUL
:nolibrarian
Modified: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-05-09
23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-05-09
23:52:54 UTC (rev 13185)
@@ -6,6 +6,8 @@
@if not exist thaw goto nothaw
@del /F thaw > NUL
@echo "Downloading Thaw"
+ at if not exist offline goto end
+ at java -jar bin\sha1test.jar Thaw/Thaw.jar . > NUL
+:end
@echo @start javaw -jar Thaw.jar > thaw.cmd
- at java -jar bin\sha1test.jar Thaw/Thaw.jar . > NUL
:nothaw
Modified: trunk/apps/new_installer/res/windows/bin/install_updater.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_updater.cmd
2007-05-09 23:17:46 UTC (rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/install_updater.cmd
2007-05-09 23:52:54 UTC (rev 13185)
@@ -4,7 +4,9 @@
@cd /D %INSTALL_PATH%
@echo "Downloading update.cmd"
+ at if not exist offline goto end
@java -jar bin\sha1test.jar update/update.cmd . > NUL
+:end
@echo node.updater.enabled=true >> freenet.ini
@if not exist update goto noautoupdate
Modified: trunk/apps/new_installer/res/windows/bin/setup.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/setup.cmd 2007-05-09 23:17:46 UTC
(rev 13184)
+++ trunk/apps/new_installer/res/windows/bin/setup.cmd 2007-05-09 23:52:54 UTC
(rev 13185)
@@ -28,3 +28,6 @@
@regedit /s fref.reg > NUL
@FTYPE fref_auto_file="$JAVA_HOME\bin\javaw.exe" -cp
"$INSTALL_PATH\freenet.jar" freenet.tools.AddRef "%%1" > NUL
@del /F fref.reg
+
+:: Are we in offline mode ?
+ at if exist offline echo "Offline installation mode"
