Author: nextgens
Date: 2008-06-09 17:44:55 +0000 (Mon, 09 Jun 2008)
New Revision: 20267
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
Log:
new_installer: enable the autostart-pack on windows too
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-06-08 15:25:04 UTC (rev
20266)
+++ trunk/apps/new_installer/install.xml 2008-06-09 17:44:55 UTC (rev
20267)
@@ -217,12 +217,16 @@
</pack>
<pack name="AutoStart" id="autostart" required="no"
parent="base">
- <os family="unix"/>
- <os family="mac"/>
<description>Start the node automatically on startup.
Strongly recommended.</description>
<singlefile src="res/license/LICENSE.Freenet"
target="$INSTALL_PATH/autostart.install"/>
- <executable
targetfile="$INSTALL_PATH/bin/remove_cronjob.sh" keep="true" stage="uninstall"/>
- <parsable
targetfile="$INSTALL_PATH/bin/remove_cronjob.sh"/>
+ <executable
targetfile="$INSTALL_PATH/bin/remove_cronjob.sh" keep="true" stage="uninstall">
+ <os family="unix"/>
+ <os family="mac"/>
+ </executable>
+ <parsable
targetfile="$INSTALL_PATH/bin/remove_cronjob.sh">
+ <os family="unix"/>
+ <os family="mac"/>
+ </parsable>
</pack>
<pack name="Firefox Profile" id="firefox_profile"
required="yes" parent="base">
Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
===================================================================
--- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
2008-06-08 15:25:04 UTC (rev 20266)
+++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd
2008-06-09 17:44:55 UTC (rev 20267)
@@ -52,6 +52,11 @@
@move /Y stop.cmd bin\stop.cmd
@echo Installing the wrapper
+ at if exist autostart.install goto startupPolicyChanged
+ at echo - Changing the startup policy of the freenet daemon to on-demand
+ at bin\cat.exe wrapper.conf | bin\sed.exe
"s/wrapper.ntservice.starttype=AUTO_START/wrapper.ntservice.starttype=DEMAND_START/g"
> autostart.install
+ at move /Y autostart.install wrapper.conf
+:startupPolicyChanged
@echo - Creating a user for freenet
:: A ugly hack to workaround password policy enforcements
@set TMPPASSWORD=%random%%random%
