Author: nextgens
Date: 2006-04-04 18:18:26 +0000 (Tue, 04 Apr 2006)
New Revision: 8455
Added:
trunk/apps/installer/installclasspath/bin/wrapper-32
Removed:
trunk/apps/installer/installclasspath/bin/wrapper
Modified:
trunk/apps/installer/build.xml
trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
trunk/apps/installer/installclasspath/run.sh
Log:
installer: more work on macos integration
Modified: trunk/apps/installer/build.xml
===================================================================
--- trunk/apps/installer/build.xml 2006-04-04 18:03:29 UTC (rev 8454)
+++ trunk/apps/installer/build.xml 2006-04-04 18:18:26 UTC (rev 8455)
@@ -180,11 +180,12 @@
<sleep seconds="10"/>
</target>
- <target name="unix" if="is_unix">
+ <target name="unix" if="is_unix" unless="is_macos">
<copy file="${basedir}/run.sh" tofile="${installDir}/run.sh"/>
<chmod file="${installDir}/run.sh" perm="755"/>
<replace file="${installDir}/run.sh">
<replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ <replacefilter token="@wrapper@" value="wrapper-32"/>
</replace>
<copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
@@ -206,7 +207,7 @@
</target>
- <target name="unix-start" if="is_unix">
+ <target name="unix-start" if="is_unix" unless="is_macos">
<echo message="Starting the node up"/>
<exec executable="sh" dir="${installDir}/">
<arg value="run.sh"/>
@@ -220,11 +221,11 @@
<chmod file="${installDir}/run.sh" perm="755"/>
<replace file="${installDir}/run.sh">
<replacefilter token="@fproxyport@"
value="${fproxyport}"/>
+ <replacefilter token="@wrapper@" value="wrapper-macos"/>
</replace>
<copy file="${basedir}/linux/update.sh"
tofile="${installDir}/update.sh"/>
<chmod file="${installDir}/update.sh" perm="755"/>
- <copy file="${basedir}/bin/wrapper-macos"
tofile="${installDir}/bin/wrapper"/>
<replace file="${installDir}/update.sh">
<replacefilter token="@path@" value="/${basedir}/"/>
@@ -241,7 +242,7 @@
<echo message="Registering as a system service if possible"/>
</target>
- <target name="macos-start" if="is_macos">
+ <target name="mac-start" if="is_macos">
<echo message="Starting the node up"/>
<exec executable="sh" dir="${installDir}/">
<arg value="run.sh"/>
Deleted: trunk/apps/installer/installclasspath/bin/wrapper
===================================================================
(Binary files differ)
Copied: trunk/apps/installer/installclasspath/bin/wrapper-32 (from rev 8452,
trunk/apps/installer/installclasspath/bin/wrapper)
Modified: trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
===================================================================
--- trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
2006-04-04 18:03:29 UTC (rev 8454)
+++ trunk/apps/installer/installclasspath/macos/CreateDesktopShortcut.sh
2006-04-04 18:18:26 UTC (rev 8455)
@@ -1,3 +1,4 @@
#!/bin/sh
ln -s $2\run.sh Freenet-$1-Start
+ln -s $2\run.sh ~/Library/Startupitems/Freenet-$1
Modified: trunk/apps/installer/installclasspath/run.sh
===================================================================
--- trunk/apps/installer/installclasspath/run.sh 2006-04-04 18:03:29 UTC
(rev 8454)
+++ trunk/apps/installer/installclasspath/run.sh 2006-04-04 18:18:26 UTC
(rev 8455)
@@ -15,7 +15,7 @@
APP_LONG_NAME="Freenet 0.7"
# Wrapper
-WRAPPER_CMD="./bin/wrapper"
+WRAPPER_CMD="./bin/@wrapper@"
WRAPPER_CONF="./wrapper.conf"
# Priority at which to run the wrapper. See "man nice" for valid priorities.
