Author: nextgens
Date: 2008-03-31 11:40:58 +0000 (Mon, 31 Mar 2008)
New Revision: 18864
Modified:
trunk/apps/new_installer/install.xml
trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
Log:
new_installer: tag the installer with the -rc1 flag
Modified: trunk/apps/new_installer/install.xml
===================================================================
--- trunk/apps/new_installer/install.xml 2008-03-30 15:37:07 UTC (rev
18863)
+++ trunk/apps/new_installer/install.xml 2008-03-31 11:40:58 UTC (rev
18864)
@@ -65,7 +65,7 @@
<variables>
<variable name="DesktopShortcutCheckboxEnabled" value="true" />
- <variable name="app-version" value="0.7-a2"/>
+ <variable name="app-version" value="0.7-rc1"/>
<variable name="released-on" value="not yet :?"/>
</variables>
Modified: trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2008-03-30 15:37:07 UTC (rev 18863)
+++ trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2008-03-31 11:40:58 UTC (rev 18864)
@@ -1,6 +1,14 @@
#!/bin/sh
+# This script create a startup script for Freenet under Mac OS X
+# 2 behaviour:
+# -pre 10.4.x: use /Library/StartupItems/
+# -post 10.4.x: use launchd
+#
+# You can send insult at nico%at%thenico%dot%fr%dot%eu%dot%org
-STARTUP_PATH="/Library/StartupItems/"
+function old_macosx () {
+
+STARTUP_PATH=""
SCRIPT="$STARTUP_PATH/Freenet/Freenet.sh"
SCRIPT_PLIST="$STARTUP_PATH/Freenet/Freenet.plist"
@@ -11,10 +19,10 @@
if test ! -d $STARTUP_PATH
then
- mkdir $STARTUP_PATH >/dev/null 2>&1
+ mkdir $STARTUP_PATH 2>&1 >/dev/null
fi
-mkdir $STARTUP_PATH/Freenet >/dev/null 2>&1
+mkdir $STARTUP_PATH/Freenet 2>&1 >/dev/null
rm -f $SCRIPT
echo "#!/bin/sh" >> $SCRIPT
echo ". /etc/rc.common" >> $SCRIPT
@@ -33,3 +41,84 @@
echo "Requires = (\"NetInfo\");" >> $SCRIPT_PLIST
echo "OrderPreference = \"last\";" >> $SCRIPT_PLIST
echo '}' >> $SCRIPT_PLIST
+}
+
+function new_macosx () {
+INSTALL_PATH="${INSTALL_PATH:-$PWD}"
+STARTUP_FILE="/Library/LaunchDaemons/org.freenetproject.freenet.plist"
+
+cd "$INSTALL_PATH"
+
+echo "Creating a startup script for Freenet"
+
+if test ! -d $STARTUP_PATH
+then
+ mkdir $STARTUP_PATH 2>&1 >/dev/null
+fi
+
+# No race condition, please :)
+touch "$STARTUP_FILE" 2>&1 >/dev/null
+chmod 755 $STARTUP_FILE 2>&1 >/dev/null
+
+touch "$STARTUP_FILE".tmp 2>&1 >/dev/null
+chmod 755 $STARTUP_FILE.tmp 2>&1 >/dev/null
+
+cat >> "$STARTUP_FILE" << 'BUG_SCRIPT'
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
+ "http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>Disabled</key>
+ <false/>
+ <key>Label</key>
+ <string>org.freenetproject.freenet</string>
+ <key>Program</key>
+
<string>REPLACE_WITH_PATH/bin/wrapper-macosx-universal-32</string>
+ <key>ProgramArguments</key>
+ <array>
+
<string>REPLACE_WITH_PATH/bin/wrapper-macosx-universal-32</string>
+ <string>-c</string>
+ <string>REPLACE_WITH_PATH/wrapper.conf</string>
+ <string>wrapper.syslog.ident=Freenet</string>
+ <string>wrapper.pidfile=REPLACE_WITH_PATH/Freenet.pid</string>
+ <string>wrapper.daemonize=TRUE</string>
+
<string>wrapper.ignore_signals=REPLACE_WITH_PATH/Freenet.anchor</string>
+ <string>wrapper.ignore_signals=TRUE</string>
+ <string>wrapper.lockfile=REPLACE_WITH_PATH/Freenet</string>
+ </array>
+ <key>WorkingDirectory</key>
+ <string>REPLACE_WITH_PATH</string>
+ <key>UserName</key>
+ <string>REPLACE_WITH_USER</string>
+ <key>ServiceDescription</key>
+ <string>Freenet is a censorhip-resistent darknet.</string>
+ <key>RunAtLoad</key>
+ <true/>
+ <key>OnDemand</key>
+ <false/>
+ <key>StandardErrorPath</key>
+ <string>/tmp/freenet-start</string>
+</dict>
+</plist>
+BUG_SCRIPT
+
+# GRUIK CODE !!
+sed "s/REPLACE_WITH_PATH/$INSTALL_PATH/" "$STARTUP_FILE" | sed
"s/REPLACE_WITH_USER/$USER/" "$STARTUP_FILE" > "$STARTUP_FILE".tmp
+mv "$STARTUP_FILE".tmp "$STARTUP_FILE" 2>&1 >/dev/null
+chmod 755 $STARTUP_FILE 2>&1 >/dev/null
+
+
+
+launchctl load $STARTUP_FILE 2>&1 >/dev/null
+
+}
+
+if [ -x /etc/launchd.conf]
+then
+new_macosx
+else
+old_macosx
+fi
+
+exit 0
