Author: nextgens
Date: 2006-03-25 18:29:21 +0000 (Sat, 25 Mar 2006)
New Revision: 8316
Modified:
trunk/apps/installer/antinstall-config.xml
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
Log:
installer: Fixes related to shortcuts
Modified: trunk/apps/installer/antinstall-config.xml
===================================================================
--- trunk/apps/installer/antinstall-config.xml 2006-03-25 18:04:01 UTC (rev
8315)
+++ trunk/apps/installer/antinstall-config.xml 2006-03-25 18:29:21 UTC (rev
8316)
@@ -199,11 +199,6 @@
displayText="Enable FCP daemon?"
defaultValue="true"
force="false"/>
- <checkbox
- property="enableFproxy"
- displayText="Enable Fproxy?"
- defaultValue="true"
- force="false"/>
</page>
<page
type="input"
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-25 18:04:01 UTC (rev 8315)
+++ trunk/apps/installer/build.xml 2006-03-25 18:29:21 UTC (rev 8316)
@@ -37,7 +37,6 @@
<replacefilter token="@enabletestnet@"
value="${enableTestnet}"/>
<replacefilter token="@enablesnmp@"
value="${enableSNMP}"/>
<replacefilter token="@enablefcp@"
value="${enableFCP}"/>
- <replacefilter token="@enablefproxy@"
value="${enableFproxy}"/>
</replace>
</target>
Modified: trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
2006-03-25 18:04:01 UTC (rev 8315)
+++ trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
2006-03-25 18:29:21 UTC (rev 8316)
@@ -1,5 +1,5 @@
#!/bin/sh
mkdir -p $HOME/Desktop
-ln -sf $1/run.sh $HOME/Desktop/Start-Freenet
-chmod 755 $1/run.sh
+echo -e "#!/bin/sh\nmozilla http://localhost:8888/"; > $HOME/Desktop/Freenet
+chmod +x $HOME/Desktop/Freenet
Modified:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-25 18:04:01 UTC (rev 8315)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-25 18:29:21 UTC (rev 8316)
@@ -1,15 +1,15 @@
set args = WScript.Arguments
-INSTALL_PATH = ""
+INSTALL_PATH = args.Item(1)
Set Shell = CreateObject("WScript.Shell")
DesktopPath = Shell.SpecialFolders("Desktop")
Set link = Shell.CreateShortcut(DesktopPath & "\Freenet.lnk")
-link.Arguments = "http://127.0.0.1:8888";
+link.Arguments = ""
link.Description = "The Free Network Project"
link.HotKey = "CTRL+ALT+SHIFT+F"
link.IconLocation = INSTALL_PATH & "\freenet.ico"
-link.TargetPath = "start"
+link.TargetPath = "http://127.0.0.1:8888";
link.WindowStyle = 1
link.WorkingDirectory = INSTALL_PATH
link.Save
