more config stuff

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4310 b35dd754-fafc-0310-a699-88a17e54d16e

build/build.xml

@@ -1221,9 +1221,7 @@
 				<include name="wildfire.sh"/>
 				<include name="extra/launchd-wrapper.sh"/>
 			</fileset>
-			<fileset dir="${basedir}/build/osx/resources">
-				<include name="postinstall"/>
-			</fileset>
+			<fileset dir="${basedir}/build/osx/resources"/>
 		</chmod>
 	</target>
 	

build/osx/resources/postinstall

 #!/bin/sh
 
-/bin/launchctl load /Library/LaunchDaemons
+/bin/launchctl load /System/Library/LaunchDaemons/org.jivesoftware.wildfire.plist
 /bin/launchctl start org.jivesoftware.wildfire
\ No newline at end of file

build/osx/resources/postupgrade

@@ -8,6 +8,5 @@ if [ -f /tmp/security ]; then
 	mv /tmp/security /usr/local/wildfire/resources/
 fi
 
-/bin/launchctl stop org.jivesoftware.wildfire stop
-/bin/launchctl load /System/Library/LaunchDaemons
-/bin/launchctl start org.jivesoftware.wildfire start
+/bin/launchctl load /System/Library/LaunchDaemons/org.jivesoftware.wildfire.plist
+/bin/launchctl start org.jivesoftware.wildfire
\ No newline at end of file
\ No newline at end of file

build/osx/resources/preupgrade

@@ -2,6 +2,7 @@
 
 # stop wildfire
 /bin/launchctl stop org.jivesoftware.wildfire
+/bin/launchctl unload /System/Library/LaunchDaemons/org.jivesoftware.wildfire.plist
 
 # preserve these files, they should never be upgraded
 cp /usr/local/wildfire/conf/wildfire.xml /tmp/