firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-22 22:43:03 +01:00
Code Issues

Apply MacOS changes to HEAD

Browse Source
This commit is contained in:
paulbeach 2007-12-20 11:34:29 +00:00
parent f450eb120a
commit 256c0ba277
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/install/arch-specific/darwin/Makefile.in
View File

@ -162,7 +162,7 @@ install_super install_server:
install_classic install_serverc:
installer -verbose -dumplog -pkg \
`pwd`/$(ROOT)/gen/firebird/Firebird-CS-$(FB_INST_VERS).$*FB_MINOR_VERS)-$(FB_PLATFORM)..pkg -target /
`pwd`/$(ROOT)/gen/firebird/Firebird-CS-$(FB_INST_VERS).$(FB_MINOR_VERS)-$(FB_PLATFORM).pkg -target /
darwin_installer_common: force
$(QUIET_ECHO) "Building Firebird Installer..."

30
builds/install/arch-specific/darwin/install-script
View File

@ -74,7 +74,6 @@ else
gid=501
dscl localhost -search /Local/Default/Groups PrimaryGroupID $gid | grep $gid
while [ "$?" = "0" ]; do
echo $gid
let "gid =$gid+1"
dscl localhost -search /Local/Default/Groups PrimaryGroupID $gid | grep $gid
done
@ -113,27 +112,18 @@ else
ugid=501
dscl localhost -search /Local/Default/Users UniqueID $ugid | grep $ugid
while [ "$?" = "0" ]; do
echo $ugid
let "ugid=$ugid+1"
dscl localhost -search /Local/Default/Users UniqueID $ugid | grep $ugid
done
echo "create the firebird user 10.5+"
dscl localhost -create /Local/Default/Users/firebird
echo "create user"
dscl localhost -create /Local/Default/Users/firebird NFSHomeDirectory /Library/Frameworks/firebird.framework
echo "create path"
dscl localhost -create /Local/Default/Users/firebird Password "*"
echo "create password"
dscl localhost -create /Local/Default/Users/firebird UserShell /bin/tcsh
echo "create shell"
dscl localhost -create /Local/Default/Users/firebird RecordName firebird
echo "create recordname"
dscl localhost -create /Local/Default/Users/firebird PrimaryGroupID $gid
echo "create primarygroupid"
dscl localhost -create /Local/Default/Users/firebird UniqueID $ugid
echo "create uniqueid"
dscl localhost -create /Local/Default/Users/firebird RealName "Firebird Database"
echo "create realname"
fi
# Shutdown any existing servers
@ -163,7 +153,7 @@ else
fi
# Install the startup item
echo "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
@ -189,14 +179,14 @@ if [ -f /etc/xinetd.d/firebird ]; then
HUPNEEDED='y'
fi
if [ -f /Library/LaunchDemons/org.firebird.gds.plist ]; then
if [ -f /Library/LaunchDaemons/org.firebird.gds.plist ]; then
launchctl unload /Library/LaunchDaemons/org.firebird.gds.plist
rm /Library/LaunchDaemons/org.firebird.gds.plist
HUPNEEDED='y'
fi
# Install ourselves in the correct place - SuperServer
echo "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
fi
@ -242,8 +232,12 @@ fi
# launchd
echo "Test launchd"
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
echo -n
else
cp $FB_FW/Resources/org.firebird.gds.plist /Library/LaunchDaemons/org.firebird.gds.plist
launchctl load /Library/LaunchDaemons/org.firebird.gds.plist
fi
# Make sure the hosts.equiv files are set correctly
echo "Make sure hosts.equiv files are set correctly"
@ -281,7 +275,9 @@ then
fi
fi
# And last but not least, start the server
#if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
# /Library/StartupItems/Firebird/Firebird start
#fi
And last but not least, start the server
echo "Start SuperServer"
if [ -f "$FB_FW/Versions/A/Resources/.SuperServer" ]; then
chmod u+xg+xo+x /Library/StartupItems/Firebird/Firebird
/Library/StartupItems/Firebird/Firebird start
fi

2
builds/install/arch-specific/darwin/launchd.org.firebird.gds.plist
View File

@ -8,7 +8,7 @@
<string>org.firebird.gds</string>
<key>ProgramArguments</key>
<array>
<string>/Library/Frameworks/Firebird.framework/resources/bin/fb_inet_server</string>
<string>/Library/Frameworks/Firebird.framework/Resources/bin/fb_inet_server</string>
</array>
<key>InetdCompatibility</key>
<dict>