Author: nextgens
Date: 2007-11-27 19:02:31 +0000 (Tue, 27 Nov 2007)
New Revision: 15985
Modified:
trunk/apps/new_installer/Win_shortcutSpec.xml
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/cleanup.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_thaw.sh
trunk/apps/new_installer/res/windows/bin/cleanup.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_thaw.cmd
Log:
new_installer:
* Fix offline installation mode
* Maybe fix the uninstaller on windows
* Fix a few shortcuts on windows
Modified: trunk/apps/new_installer/Win_shortcutSpec.xml
===================================================================
--- trunk/apps/new_installer/Win_shortcutSpec.xml 2007-11-27 18:49:40 UTC
(rev 15984)
+++ trunk/apps/new_installer/Win_shortcutSpec.xml 2007-11-27 19:02:31 UTC
(rev 15985)
@@ -5,23 +5,7 @@
<skipIfNotSupported />
<programGroup defaultName="The Free Network Project"
location="applications"/>
-
- <shortcut
- name="Freenet Uninstaller"
- programGroup="yes"
- desktop="no"
- applications="no"
- startMenu="no"
- startup="no"
- target="http://wiki.freenetproject.org/FreenetUninstall";
- iconFile="%SystemRoot%\system32\SHELL32.dll"
- iconIndex="31"
- workingDirectory="$INSTALL_PATH"
- description="This uninstalls Freenet">
- <createForPack name="UninstallStuff" />
- </shortcut>
-
<shortcut
name="Browse Freenet"
programGroup="yes"
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2007-11-27 18:49:40 UTC (rev
15984)
+++ trunk/apps/new_installer/install.xml 2007-11-27 19:02:31 UTC (rev
15985)
@@ -231,7 +231,7 @@
<pack name="UninstallStuff" id="uninstall" required="no"
os="windows">
<description>Create uninstallation hooks in the
registry</description>
- <executable
targetfile="$INSTALL_PATH\bin\uninstall_service.bat" os="windows" keep="true"
stage="uninstall"/>
+ <executable
targetfile="$INSTALL_PATH\bin\remove_service.bat" os="windows" keep="true"
stage="uninstall"/>
</pack>
<pack name="AutoUpdater" id="autoupdater" required="no">
@@ -261,17 +261,17 @@
<pack name="jSite" id="jsite" required="no">
<description>A tool to upload websites to
freenet</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/jsite"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/jsite.install"/>
</pack>
<pack name="frost" id="frost" required="no">
<description>A message board application for freenet
(http://jtcfrost.sourceforge.net/)</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/frost"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/frost.install"/>
</pack>
<pack name="thaw" id="thaw" required="no">
<description>A powerful filesharing tool designed for
freenet</description>
- <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thaw"/>
+ <singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/thaw.install"/>
</pack>
</packs>
Modified: trunk/apps/new_installer/res/unix/bin/cleanup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/cleanup.sh 2007-11-27 18:49:40 UTC
(rev 15984)
+++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2007-11-27 19:02:31 UTC
(rev 15985)
@@ -4,6 +4,8 @@
cd "$INSTALL_PATH"
+echo End >> freenet.ini
+
# 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 offline
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-11-27
19:02:31 UTC (rev 15985)
@@ -4,9 +4,9 @@
cd "$INSTALL_PATH"
-if test -e frost
+if test -e frost.install
then
- rm -f frost
+ rm -f frost.install
if test ! -e offline
then
echo "Downloading frost"
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-11-27
19:02:31 UTC (rev 15985)
@@ -4,9 +4,9 @@
cd "$INSTALL_PATH"
-if test -e jsite
+if test -e jsite.install
then
- rm -f jsite
+ rm -f jsite.install
if test ! -e offline
then
echo "Downloading jSite"
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-11-27
19:02:31 UTC (rev 15985)
@@ -4,9 +4,9 @@
cd "$INSTALL_PATH"
-if test -e thaw
+if test -e thaw.install
then
- rm -f thaw
+ rm -f thaw.install
if test ! -e offline
then
echo "Downloading Thaw"
Modified: trunk/apps/new_installer/res/windows/bin/cleanup.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2007-11-27
19:02:31 UTC (rev 15985)
@@ -3,6 +3,7 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
+ at echo End >> freenet.ini
:: Keep application installers in case users want to perform updates
@cd bin
@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_frost.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2007-11-27
19:02:31 UTC (rev 15985)
@@ -3,8 +3,8 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
- at if not exist frost goto nofrost
- at del /F frost > NUL
+ at if not exist frost.install goto nofrost.install
+ at del /F frost.install > NUL
@if exist offline goto end
@echo Downloading Frost
@java -jar bin\sha1test.jar frost/frost.zip . > NUL
Modified: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2007-11-27
19:02:31 UTC (rev 15985)
@@ -3,8 +3,8 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
- at if not exist jsite goto nojsite
- at del /F jsite > NUL
+ at if not exist jsite.install goto nojsite.install
+ at del /F jsite.install > NUL
@if exist offline goto end
@echo Downloading jSite
@mkdir jSite
Modified: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-11-27
18:49:40 UTC (rev 15984)
+++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2007-11-27
19:02:31 UTC (rev 15985)
@@ -3,8 +3,8 @@
@set JAVA_HOME=$JAVA_HOME
@cd /D %INSTALL_PATH%
- at if not exist thaw goto nothaw
- at del /F thaw > NUL
+ at if not exist thaw.install goto nothaw
+ at del /F thaw.install > NUL
@echo Downloading Thaw
@if exist offline goto end
@mkdir Thaw
