[Firebird-checkins] CVS: firebird2/builds/install/arch-specific/darwin install-script, 1.8.2.2, 1.8.2.3

[Paul B. <pau...@us...>]

Build Version :  T2.5.0.19038 Firebird 2.5 Unstable

(writeBuildNum.sh,v 1.19198 2008/03/24 14:02:52 paulbeach E )

Update of /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv23183/builds/install/arch-specific/darwin

Modified Files:
      Tag: B2_1_Release
	install-script 
Log Message:
These changes to 2.0 should be in 2.1 as well

Index: install-script
===================================================================
RCS file: /cvsroot/firebird/firebird2/builds/install/arch-specific/darwin/install-script,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -b -U3 -r1.8.2.2 -r1.8.2.3
--- install-script	6 Feb 2008 16:20:16 -0000	1.8.2.2
+++ install-script	24 Mar 2008 14:02:49 -0000	1.8.2.3
@@ -20,23 +20,10 @@
 
 FB_FW="/Library/Frameworks/Firebird.framework"
 FB_RES="$FB_FW/Versions/A/Resources"
-INST_RES="$FB_RES/installer_files"
-
-# Install and start sysv semaphores
-echo "Install and start sysv semaphores"
-if test `uname -r | sed -e 's/\.[0-9]*//g'` -lt 6; then
-	if [ -e "SysV Semaphores" ]; then
-		mkdir -p /Library/StartupItems
-		if [ ! -e "/Library/StartupItems/SysV Semaphores" ]; then
-			cp -r "$INST_RES/SysV Semaphores" /Library/StartupItems
-			"/Library/StartupItems/SysV Semaphores/SysV Semaphores" start
-		fi
-	fi
-fi
 
 if test $OSVERSION -lt 5; then
 # Setup our services entry 
-echo "Setup the service entry pre 10.5"
+echo "Setup the service entry 10.4-"
 if niutil -list . /services/gds_db 2&>1 /dev/null ; then
 	echo -n
 else
@@ -46,15 +33,12 @@
 fi
 fi
 
-# No niutil on 10.5
-# Setup our services entry
-echo "Setup the service entry 10.5+"
 
 if test $OSVERSION -lt 5; then 
 # niutil works pre 10.5
 # Now for the group.  If the firebird group already exists, remember the
 # id if we need it to create the firebird user
-echo "Create the Firebird group pre 10.5"
+echo "Create the Firebird group 10.4-"
 if niutil -list . /groups/firebird 2&>1 /dev/null; then
 	NEW_GID=`niutil -readprop . /groups/firebird gid`
 else
@@ -64,10 +48,11 @@
 	niutil -createprop . /groups/firebird gid $NEW_GID
 	niutil -createprop . /groups/firebird users firebird
 fi
-fi
+else
 
 # No niutil on 10.5
 # Now create the firebird group
+echo "Create the Firebird group 10.5+"
 if dscl localhost -read /Local/Default/Groups/firebird 2&>1 /dev/null; then
 	echo "Group Found" 
 else
@@ -77,17 +62,17 @@
 	let "gid =$gid+1"
 	dscl localhost -search /Local/Default/Groups PrimaryGroupID $gid | grep $gid
 done
-echo "Create the Firebird group 10.5+"
 	dscl localhost -create /Local/Default/Groups/firebird
 	dscl localhost -create /Local/Default/Groups/firebird Password "*"
 	dscl localhost -create /Local/Default/Groups/firebird PrimaryGroupID $gid
 	dscl localhost -create /Local/Default/Groups/firebird RecordName firebird
 fi
+fi
 
 if test $OSVERSION -lt 5; then
 # niutil works pre 10.5
 # Now create the firebird user
-echo "Create the Firebird user pre 10.5"
+echo "Create the Firebird user 10.4-"
 if niutil -list . /users/firebird 2&>1 /dev/null; then
 	echo -n
 else
@@ -102,10 +87,11 @@
 	niutil -createprop . /users/firebird gid $NEW_GID
 	niutil -createprop . /users/firebird realname "Firebird Database"
 fi
-fi
+else
 
 # no niutil on 10.5 use dscl
 # Now create the firebird user
+echo "Create the Firebird user 10.5+"
 if dscl localhost -read /Local/Default/Users/firebird 2&>1 /dev/null; then
 	echo "User Found"
 else
@@ -125,6 +111,7 @@
 	dscl localhost -create /Local/Default/Users/firebird UniqueID $ugid
 	dscl localhost -create /Local/Default/Users/firebird RealName "Firebird Database"
 fi
+fi
 
 # Shutdown any existing servers
 echo "Shutdown any existing servers"
@@ -153,16 +140,6 @@
     chmod a+s "$FB_FW/Resources/bin/fb_inet_server"
 fi
 
-# Install the startup item
-echo "Re-install the SuperServer startup item - if it already exists"
-if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
-	if [ -e "$INST_RES/Firebird.startup" ]; then
-		rm -rf /Library/StartupItems/Firebird
-		cp -r "$INST_RES/Firebird" /Library/StartupItems/Firebird
-	fi
-else
-	rm -rf /Library/StartupItems/Firebird
-fi
 
 # Remove all traces of Classic first
 echo "Remove all traces of Classic first"
@@ -189,7 +166,10 @@
 # Install ourselves in the correct place - SuperServer
 echo "Install StartupItem in the correct place SuperServer"
 if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
-	cp -r $1/Contents/Resources/StartupItem /Library/StartupItems/Firebird
+	rm -fr /Library/StartupItems/Firebird
+	cp -r "$1/Contents/Resources/StartupItem" /Library/StartupItems/Firebird
+else
+	rm -fr /Library/StartupItems/Firebird
 fi
 
 # Install ourselves in the correct place - Classic 
@@ -261,6 +241,21 @@
 	rm -f /tmp/fb-security-database-update2.fdb
 fi
 
+#Install the saved aliases.conf, if any
+echo "Install the saved aliases.conf file"
+if test -f /tmp/fb-aliases.conf; then
+	mv -f /tmp/fb-aliases.conf "$FB_RES/English.lproj/var/aliases.conf"
+	rm -f /tmp/fb-aliases.conf
+fi
+
+#Install the saved UDF libraries, if any
+echo "Install the saved UDF libraries"
+for file in /tmp/*UDF_save_*; do
+new=`echo $file | sed -e 's/UDF_save_//g'`
+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' ]