Menu
▾
▴
[Firebird-checkins] CVS: firebird2/src/install/arch-specific/darwin ReadMe.txt, 1.1.2.2, 1.1.2.3 install-script, 1.1.2.9, 1.1.2.10 preupgrade-script, 1.1.2.4, 1.1.2.5
|
From: Paul B. <pau...@us...> - 2008-02-18 11:44:55
|
Build Version : T2.5.0.18392 Firebird 2.5 Unstable (writeBuildNum.sh,v 1.18552 2008/02/18 11:44:51 paulbeach E ) Update of /cvsroot/firebird/firebird2/src/install/arch-specific/darwin In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv24525/src/install/arch-specific/darwin Modified Files: Tag: B1_5_Release ReadMe.txt install-script preupgrade-script Log Message: Add the Readme.txt, allow package upgrade of aliases.conf and UDF files, so existing installations get upgraded properly. Index: ReadMe.txt =================================================================== RCS file: /cvsroot/firebird/firebird2/src/install/arch-specific/darwin/Attic/ReadMe.txt,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -b -U3 -r1.1.2.2 -r1.1.2.3 --- ReadMe.txt 17 Dec 2007 14:48:34 -0000 1.1.2.2 +++ ReadMe.txt 18 Feb 2008 11:44:45 -0000 1.1.2.3 @@ -5,3 +5,9 @@ Please note that every MacOS X user you want to have access to your database MUST have read/write permissions on the .gdb file. The complete 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) Index: install-script =================================================================== RCS file: /cvsroot/firebird/firebird2/src/install/arch-specific/darwin/Attic/install-script,v retrieving revision 1.1.2.9 retrieving revision 1.1.2.10 diff -b -U3 -r1.1.2.9 -r1.1.2.10 --- install-script 20 Dec 2007 10:16:43 -0000 1.1.2.9 +++ install-script 18 Feb 2008 11:44:46 -0000 1.1.2.10 @@ -22,23 +22,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 @@ -48,15 +35,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 @@ -66,10 +50,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 @@ -79,17 +64,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 @@ -104,10 +89,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 @@ -127,6 +113,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" @@ -157,17 +144,6 @@ chmod a+s "$FB_FW/Resources/bin/fb_inet_server" fi -# Install the startup item -echo "Re-install the 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" if [ -f /etc/inetd.conf ]; then @@ -193,7 +169,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 @@ -201,7 +180,7 @@ # inetd.d - older versions of MacOS echo "Test inetd" -if [ -f //var/run/inted.pid -a -d /etc/inetd.d ]; then +if [ -f /var/run/inetd.pid -a -d /etc/inetd.d ]; then if [ -f /etc/inetd.conf ]; then echo "gds_db stream tcp nowait root $FB_FW/Resources/bin/fb_inet_server fb_inet_server" > /etc/.fb.inetd.conf.entry cat /etc/inetd.conf /etc/.fb.inetd.conf.entry > /etc/.interbase.temp.install.inetd.conf @@ -265,6 +244,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 /temp/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' ] Index: preupgrade-script =================================================================== RCS file: /cvsroot/firebird/firebird2/src/install/arch-specific/darwin/Attic/preupgrade-script,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -b -U3 -r1.1.2.4 -r1.1.2.5 --- preupgrade-script 17 Dec 2007 14:48:35 -0000 1.1.2.4 +++ preupgrade-script 18 Feb 2008 11:44:46 -0000 1.1.2.5 @@ -19,11 +19,35 @@ mv -f "$FB_FW/Firebird.framework/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/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 -rm -rf "$FB_FW/Firebird.framework" -rm -rf /Library/StartupItems/Firebird + +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 -fr "$FB_FW/Firebird.framework" exit 0 |