Author: nextgens
Date: 2006-03-30 21:43:44 +0000 (Thu, 30 Mar 2006)
New Revision: 8376
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
Log:
installer: Desktop icons shoudn't be created with the same name
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-03-30 21:28:57 UTC (rev 8375)
+++ trunk/apps/installer/build.xml 2006-03-30 21:43:44 UTC (rev 8376)
@@ -147,6 +147,7 @@
<exec executable="cscript" dir="${basedir}/windows" >
<arg value="CreateDesktopShortcut.vbs"/>
<arg value=""${installDir}""/>
+ <arg value="${freenetWorkingMode}"/>
<arg value="${fproxyport}"/>
</exec>
@@ -168,7 +169,7 @@
<chmod file="${basedir}/linux/CreateDesktopShortcut.sh"
perm="775"/>
<exec executable="sh" dir="${basedir}/linux/">
<arg value="CreateDesktopShortcut.sh"/>
- <arg value=""${installDir}""/>
+ <arg value="${freenetWorkingMode}"/>
<arg value="${fproxyport}"/>
</exec>
Modified: trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
===================================================================
--- trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
2006-03-30 21:28:57 UTC (rev 8375)
+++ trunk/apps/installer/installclasspath/linux/CreateDesktopShortcut.sh
2006-03-30 21:43:44 UTC (rev 8376)
@@ -1,5 +1,5 @@
#!/bin/sh
mkdir -p $HOME/Desktop
-echo -e "#!/bin/sh\nmozilla http://localhost:$2/"; > $HOME/Desktop/Freenet
+echo -e "#!/bin/sh\nmozilla http://localhost:$2/"; > $HOME/Desktop/Freenet-$1
chmod +x $HOME/Desktop/Freenet
Modified:
trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
===================================================================
--- trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-30 21:28:57 UTC (rev 8375)
+++ trunk/apps/installer/installclasspath/windows/CreateDesktopShortcut.vbs
2006-03-30 21:43:44 UTC (rev 8376)
@@ -1,11 +1,12 @@
set args = WScript.Arguments
INSTALL_PATH = args.Item(0)
-PORT = args.Item(1)
+KIND = args.Item(1)
+PORT = args.Item(2)
Set Shell = CreateObject("WScript.Shell")
DesktopPath = Shell.SpecialFolders("Desktop")
-Set link = Shell.CreateShortcut(DesktopPath & "\Freenet.lnk")
+Set link = Shell.CreateShortcut(DesktopPath & "\Freenet-" & KIND & ".lnk")
link.Arguments = ""
link.Description = "The Free Network Project"
link.HotKey = "CTRL+ALT+SHIFT+F"
@@ -15,7 +16,7 @@
link.WorkingDirectory = INSTALL_PATH
link.Save
-Set link = Shell.CreateShortcut(DesktopPath & "\start-Freenet.lnk")
+Set link = Shell.CreateShortcut(DesktopPath & "\start-Freenet-" & KIND &
".lnk")
link.Arguments = "start freenet"
link.Description = "The Free Network Project"
link.HotKey = ""
