Minor Mods for the Installer

builds/install/arch-specific/darwin/Readme.txt

@@ -4,4 +4,10 @@ All the standard command line executables are installed in /Library/Frameworks/F
 
 Please note that every MacOS X user you want to have access to your database MUST have read/write permissions on the .fdb file.
 
-The release notes can be found in the doc directory  Generic documentation for Firebird can be found on the IBPhoenix web site at www.ibphoenix.com, as well as at the Firebird website. There is also a  yahoo group named "ib-support" if you have any problems with firebird.
+The release notes can be found in the doc directory  Generic documentation for Firebird can be found on the IBPhoenix web site at www.ibphoenix.com, as well as at the Firebird website. There is also a yahoo group named "ib-support" if you have any problems with Firebird.
+Thanks to:
+John Bellardo (Original MacOSX port for Firebird)
+David Pugh (Firebird 1.5.3 Port)
+Paul Beach & Alex Peshkov (Firebird 1.5.x & 2.x Ports)
+Daniel Puckett (Firebird 2.x Launch Daemon for MacOSX 10.5+) 
+Craig Altenburg (Improvements to the install scripts)

builds/install/arch-specific/darwin/install-script

@@ -255,6 +255,7 @@ return=`basename $new`
 cp $file "$FB_RES/English.lproj/var/UDF/$return"
 rm $file
 done
+
 # Tell inetd/xinetd to reload their configuration files.
 echo "Tell inetd/xinetd to reload configuration files"
 if [ "$HUPNEEDED" = 'y' ]

builds/install/arch-specific/darwin/preupgrade-script

@@ -12,23 +12,41 @@ FB_FW="/Library/Frameworks/Firebird.framework"
 if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.gdb"; then
 	mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.gdb" /tmp/fb-security-database-update.fdb
 fi
-if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.fdb"; then
-	mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/isc4.fdb" /tmp/fb-security-database-update.fdb
-fi
 if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security.fdb"; then
 	mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security.fdb" /tmp/fb-security-database-update.fdb
 fi
 if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb"; then
 	mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/security2.fdb" /tmp/fb-security-database-update2.fdb
 fi
+if test -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf"; then
+	mv -f "$FB_FW/Versions/A/Resources/English.lproj/var/aliases.conf" /tmp/fb-aliases.conf
+fi
+
+for i in /Library/Frameworks/Firebird.framework/Resources/English.lproj/var/UDF/*;do
+x=`basename $i`
+if test $x = "fbudf.dylib"; then
+	echo -n
+elif test $x = "fbudf.sql"; then
+	echo -n
+elif test $x = "ib_udf.dylib"; then
+	echo -n
+elif test $x = "ib_udf.sql"; then
+	echo -n
+else
+	cp $i /tmp/UDF_save_$x
+fi
+done
+
 if [ -f /Library/StartupItems/Firebird/Firebird ]; then
 	/Library/StartupItems/Firebird/Firebird stop
+	rm -fr /Library/StartupItems/Firebird
 fi
 
 if [ -f /Library/LaunchDaemons/org.firebird.gds.plist ]; then
 	launchctl unload /Library/LaunchDaemons/org.firebird/gds.plist
+	rm /Library/LaunchDaemons/org.firebird.gds.plist
 fi
+
 rm -rf "$FB_FW/Firebird.framework"
-rm -rf /Library/StartupItems/Firebird
+
-rm /Library/LaunchDaemons/org.firebird.gds.plist
 exit 0