From 2b382f606b6ee54f869fee3f30769ffd340706b3 Mon Sep 17 00:00:00 2001 From: alexpeshkoff Date: Wed, 7 May 2008 16:34:47 +0000 Subject: [PATCH] 1. Deeper integration between super and classic setup. 2. Script to switch between classic and superclassic modes. 3. Changed lisences from LGPL to IDPL (with Mark's agreement) --- .../install/arch-specific/linux/Makefile.in | 44 ++-- .../linux/classic/makeInstallImage.sh.in | 64 ++--- .../linux/classic/postinstall.sh.in | 93 ------- .../linux/classic/postuninstall.sh.in | 44 ---- .../linux/classic/preinstall.sh.in | 82 ------ .../linux/classic/preuninstall.sh.in | 53 ---- .../linux/classic/tarMainInstall.sh.in | 77 ------ .../linux/classic/tarMainUninstall.sh.in | 88 ------- .../linux/classic/tarinstall.sh.in | 46 ---- .../linux/classic/taruninstall.sh.in | 40 --- .../linux/{classic => misc}/README | 2 +- .../linux/misc/linuxLibrary.sh.in | 236 +++++++++++++++++- .../linux/misc/postinstall.sh.in | 82 ++++++ .../linux/misc/postuninstall.sh.in | 38 +++ .../arch-specific/linux/misc/preinstall.sh.in | 72 ++++++ .../linux/misc/preuninstall.sh.in | 44 ++++ .../arch-specific/linux/misc/superLinux.sh.in | 165 ------------ .../linux/misc/tarMainInstall.sh.in | 62 +++++ .../linux/misc/tarMainUninstall.sh.in | 75 ++++++ .../arch-specific/linux/misc/tarinstall.sh.in | 35 +++ .../linux/misc/taruninstall.sh.in | 28 +++ .../linux/super/makeInstallImage.sh.in | 55 ++-- .../linux/super/postinstall.sh.in | 38 --- .../linux/super/postuninstall.sh.in | 41 --- .../linux/super/preinstall.sh.in | 8 - .../linux/super/preuninstall.sh.in | 27 -- .../linux/super/tarMainInstall.sh.in | 80 ------ .../linux/super/tarMainUninstall.sh.in | 94 ------- .../linux/super/tarinstall.sh.in | 46 ---- .../linux/super/taruninstall.sh.in | 40 --- .../misc/changeGdsLibraryCompatibleLink.sh.in | 53 ++-- .../install/misc/changeMultiConnectMode.sh.in | 65 +++++ builds/install/misc/changeRunUser.sh.in | 22 ++ builds/install/misc/classicLibrary.sh.in | 40 +-- builds/install/misc/fb_config.in | 44 ++-- builds/install/misc/posixLibrary.sh.in | 40 ++- builds/install/misc/restoreRootRunUser.sh.in | 22 ++ builds/install/misc/superLibrary.sh.in | 22 ++ 38 files changed, 962 insertions(+), 1245 deletions(-) delete mode 100644 builds/install/arch-specific/linux/classic/postinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/postuninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/preinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/preuninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/tarMainInstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/tarMainUninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/tarinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/classic/taruninstall.sh.in rename builds/install/arch-specific/linux/{classic => misc}/README (93%) create mode 100644 builds/install/arch-specific/linux/misc/postinstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/postuninstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/preinstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/preuninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/misc/superLinux.sh.in create mode 100644 builds/install/arch-specific/linux/misc/tarMainInstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/tarMainUninstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/tarinstall.sh.in create mode 100644 builds/install/arch-specific/linux/misc/taruninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/postinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/postuninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/preinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/preuninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/tarMainInstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/tarMainUninstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/tarinstall.sh.in delete mode 100644 builds/install/arch-specific/linux/super/taruninstall.sh.in create mode 100644 builds/install/misc/changeMultiConnectMode.sh.in diff --git a/builds/install/arch-specific/linux/Makefile.in b/builds/install/arch-specific/linux/Makefile.in index 030f37cbb4..0a76952bb5 100644 --- a/builds/install/arch-specific/linux/Makefile.in +++ b/builds/install/arch-specific/linux/Makefile.in @@ -1,30 +1,24 @@ -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. # -# Created by: Mark O'Donohue +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. # -# Contributor(s): # # ROOT=.. diff --git a/builds/install/arch-specific/linux/classic/makeInstallImage.sh.in b/builds/install/arch-specific/linux/classic/makeInstallImage.sh.in index 959288b0d9..7935626cf2 100644 --- a/builds/install/arch-specific/linux/classic/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/classic/makeInstallImage.sh.in @@ -1,36 +1,26 @@ #!/bin/sh -# This library is part of the FirebirdSQL project # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# # Script to copy install files from the build/transport area @@ -129,15 +119,14 @@ copyFiles() { mkdir -p $TargetDir@libdir@ mkdir -p $TargetDir/usr/include - cp -f $BuiltFBDir/bin/fb_inet_server $DestDir/bin/fb_inet_server - cp -f $BuiltFBDir/bin/fb_smp_server $DestDir/bin/fb_smp_server + cp -f $BuiltFBDir/bin/fb_inet_server $DestDir/bin/fb_inet_server + cp -f $BuiltFBDir/bin/fb_smp_server $DestDir/bin/fb_smp_server + cp -f $BuiltFBDir/bin/fbguard $DestDir/bin/fbguard cp $BuiltFBDir/bin/gbak $DestDir/bin/gbak cp $BuiltFBDir/bin/gdef $DestDir/bin/gdef cp $BuiltFBDir/bin/gds_drop $DestDir/bin/gds_drop - copyIfExists $BuiltFBDir/bin/fb_lock_mgr $DestDir/bin/fb_lock_mgr copyIfExists $BuiltFBDir/bin/fb_lock_print $DestDir/bin/fb_lock_print - copyIfExists $BuiltFBDir/bin/gds_pipe $DestDir/bin/gds_pipe cp $BuiltFBDir/bin/gfix $DestDir/bin/gfix cp $BuiltFBDir/bin/gpre $DestDir/bin/gpre cp $BuiltFBDir/bin/gsec $DestDir/bin/gsec @@ -145,7 +134,6 @@ copyFiles() { copyIfExists $BuiltFBDir/bin/gsplit $DestDir/bin/gsplit cp $BuiltFBDir/bin/gstat $DestDir/bin/gstat copyIfExists $BuiltFBDir/bin/fbsvcmgr $DestDir/bin/fbsvcmgr - copyIfExists $BuiltFBDir/bin/isc4.gbak $DestDir/bin/isc4.gbak cp $BuiltFBDir/bin/isql $DestDir/bin/isql cp $BuiltFBDir/bin/qli $DestDir/bin/qli @@ -153,6 +141,7 @@ copyFiles() { addLibs $BuildRootDir/gen/firebird/bin changeRunUser.sh $DestDir/bin addLibs $BuildRootDir/gen/firebird/bin restoreRootRunUser.sh $DestDir/bin addLibs $BuildRootDir/gen/firebird/bin changeDBAPassword.sh $DestDir/bin + addLibs $BuildRootDir/gen/firebird/bin changeMultiConnectMode.sh $DestDir/bin addLibs $BuiltFBDir/bin changeGdsLibraryCompatibleLink.sh $DestDir/bin addLibs $BuildRootDir/gen/firebird/bin tarMainInstall.sh $BuildRootDir/gen/install/scripts addLibs $BuildRootDir/gen/firebird/bin tarinstall.sh $BuildRootDir/gen/install/scripts @@ -227,7 +216,8 @@ copyFiles() { cp $BuildRootDir/gen/install/misc/firebird.conf $DestDir/ cp $BuildRootDir/gen/install/misc/aliases.conf $DestDir/ cp $BuildRootDir/gen/install/misc/fbintl.conf $DestDir/intl/ - + cp $BuildRootDir/gen/install/misc/firebird.init.d.* $DestDir/misc/ + cp $BuildRootDir/gen/install/misc/rc.config.firebird $DestDir/misc # Create links from @libdir@ to install area. diff --git a/builds/install/arch-specific/linux/classic/postinstall.sh.in b/builds/install/arch-specific/linux/classic/postinstall.sh.in deleted file mode 100644 index a2754fd720..0000000000 --- a/builds/install/arch-specific/linux/classic/postinstall.sh.in +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh -# -# This library is part of the Firebird project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# - -# The post install script for Firebird Classic - - - - # Detect which linux distro we are installing on - detectDistro - - # Make sure the links are in place - if [ -z "$FirebirdInstallPrefix" ] - then - FirebirdInstallPrefix=@prefix@ - fi - - origDir=`pwd` - - # Update /etc/services - - # The \n is needed, some /etc/services files are missing a trailing - # line feed - MOD 7-Nov-2002 - FileName=/etc/services - newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" - oldLine=`grep "^gds_db" $FileName` - if [ -z "$oldLine" ] - then - echo "" >> $FileName - echo $newLine >> $FileName - echo "" >> $FileName - # replaceLineInFile "$FileName" "$newLine" "$oldLine" - fi - - # add Firebird user - if [ $RunUser = "firebird" ] - then - addFirebirdUser - fi - - - # Update ownership and SUID bits for files. - fixFilePermissions - - # Create libgds.so links - createLinksForBackCompatibility - - # Prepare for uninstall - buildUninstallFile - - - # Update the /etc/inetd.conf or xinetd entry - updateInetdServiceEntry - - # Get inetd to reread new init files. - resetInetdServer - - - cd $FBRootDir - - # Change sysdba password - changeDBAPassword diff --git a/builds/install/arch-specific/linux/classic/postuninstall.sh.in b/builds/install/arch-specific/linux/classic/postuninstall.sh.in deleted file mode 100644 index 4f50ea9d15..0000000000 --- a/builds/install/arch-specific/linux/classic/postuninstall.sh.in +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# This library is part of the Firebird project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: postuninstall.sh.in,v 1.4 2005-08-16 10:04:11 alexpeshkoff Exp $ -# - -# The post uninstall routine for Firebird Classic. - - -if [ "$1"=0 ] -then - removeLinksForBackCompatibility - removeInetdServiceEntry -fi diff --git a/builds/install/arch-specific/linux/classic/preinstall.sh.in b/builds/install/arch-specific/linux/classic/preinstall.sh.in deleted file mode 100644 index 7e5fe7b6bb..0000000000 --- a/builds/install/arch-specific/linux/classic/preinstall.sh.in +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh -# -# This library is part of the FirebirdSQL project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: preinstall.sh.in,v 1.7 2005-08-16 10:04:11 alexpeshkoff Exp $ -# - - -# The pre install routine for Firebird Classic - - - -#------------------------------------------------------------------------ -# Check for installed RPM package - -# (Pavel I've left this in since originally I could test for other packages, -# even if they did not conflict with current ones, ie we can test InterBase -# and CS/SS The package manager does not allow it currently but I've left -# this in in case that sort of thing gets allowed again - -#checkForRPMInstall() { -# PackageName=$1 -# -# rpm -q $PackageName -# STATUS=$? -# if [ $STATUS -eq 0 ] -# then -# echo "Previous version of $PackageName is detected on your system." -# echo "this will conflict with the current install of Firebird" -# echo "Please unistall the previous version `rpm -q $PackageName` and then proceed." -# exit $STATUS -# fi -# -#} - - - -#= Main Pre ================================================================ - -# Ok so any of the following packages are a problem -# these don't work at least in the latest rpm manager, since it -# has the rpm database locked and it fails. - -# checkForRPMInstall InterBase -# checkForRPMInstall FirebirdCS -# checkForRPMInstall FirebirdSS - - - checkIfServerRunning - -# Failing that we archive any files we find - - archivePriorInstallSystemFiles diff --git a/builds/install/arch-specific/linux/classic/preuninstall.sh.in b/builds/install/arch-specific/linux/classic/preuninstall.sh.in deleted file mode 100644 index 33319d63ce..0000000000 --- a/builds/install/arch-specific/linux/classic/preuninstall.sh.in +++ /dev/null @@ -1,53 +0,0 @@ -#! /bin/sh -# -# This library is part of the FirebirdSQL project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# - -# The pre uninstall routines for Firebird Classic - - checkIfServerRunning - - cd $FBRootDir - - if [ -f $SecurityDatabase ] - then - cp $SecurityDatabase /tmp - echo "Saved a copy of $SecurityDatabase in /tmp" - fi - - for i in isc_*1* firebird.log SYSDBA.password - do - if [ -f $i ] - then - rm -f $i - fi - done diff --git a/builds/install/arch-specific/linux/classic/tarMainInstall.sh.in b/builds/install/arch-specific/linux/classic/tarMainInstall.sh.in deleted file mode 100644 index 06f3fe87a1..0000000000 --- a/builds/install/arch-specific/linux/classic/tarMainInstall.sh.in +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# This library is part of the FirebirdSQL project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: tarMainInstall.sh.in,v 1.2 2005-08-16 10:04:11 alexpeshkoff Exp $ -# - -# Install script for FirebirdSQL database engine -# http://www.firebirdsql.org - - -InteractiveInstall=1 -export InteractiveInstall - - -checkInstallUser - -BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ -PackageVersion=@FIREBIRD_PACKAGE_VERSION@ -CpuType=@CPU_TYPE@ - -Version="$BuildVersion-$PackageVersion.$CpuType" - - -cat < -# -# Contributor(s): -# -# -# $Id: tarMainUninstall.sh.in,v 1.2 2005-08-16 10:04:11 alexpeshkoff Exp $ -# - -# Install script for FirebirdSQL database engine -# http://www.firebirdsql.org - - -InteractiveInstall=1 -export InteractiveInstall - - -checkInstallUser - -BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ -PackageVersion=@FIREBIRD_PACKAGE_VERSION@ -CpuType=@CPU_TYPE@ - -FBRootDir=@prefix@ - -Version="$BuildVersion-$PackageVersion.$CpuType" - - -cat < -# -# Contributor(s): -# -# -# - -# The way this works is that the buildroot file is stored relative to the root -# directory and a tar -xzof at root directory will restore all the files in -# the position that we want them to be - -OrigDir=`pwd` - -cd / - -tar -xzof $OrigDir/buildroot.tar.gz - -cd $OrigDir diff --git a/builds/install/arch-specific/linux/classic/taruninstall.sh.in b/builds/install/arch-specific/linux/classic/taruninstall.sh.in deleted file mode 100644 index 283e440081..0000000000 --- a/builds/install/arch-specific/linux/classic/taruninstall.sh.in +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# -# This library is part of the FirebirdSQL project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: taruninstall.sh.in,v 1.2 2005-08-16 10:04:11 alexpeshkoff Exp $ -# - - -removeInstalledFiles # Remove installed files -removeUninstallFiles # Remove the 'uninstall' utility files -removeEmptyDirs # Remove empty directories diff --git a/builds/install/arch-specific/linux/classic/README b/builds/install/arch-specific/linux/misc/README similarity index 93% rename from builds/install/arch-specific/linux/classic/README rename to builds/install/arch-specific/linux/misc/README index 86fde421de..b3c67b68fa 100644 --- a/builds/install/arch-specific/linux/classic/README +++ b/builds/install/arch-specific/linux/misc/README @@ -1,4 +1,4 @@ -Firebird 2.0 Classic Server for Linux +Firebird 2 Server for Linux More information can be found about the Firebird diff --git a/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in b/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in index 8b0dbdc84b..a3cf297b7d 100644 --- a/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in +++ b/builds/install/arch-specific/linux/misc/linuxLibrary.sh.in @@ -1,4 +1,26 @@ #!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# RunUser=firebird export RunUser @@ -119,7 +141,7 @@ getInitScriptLocation() { # stop super server if it is running stopSuperServerIfRunning() { - checkString=`ps -efww| egrep "\b(fbserver|fbguard)\b" |grep -v grep` + checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep` if [ ! -z "$checkString" ] then @@ -132,7 +154,7 @@ stopSuperServerIfRunning() { do $init_d stop sleep 1 - checkString=`ps -efww| egrep "\b(fbserver|fbguard)\b" |grep -v grep` + checkString=`ps -eaf | egrep "\b(fbserver|fbguard|fb_smp_server)\b" |grep -v grep` if [ -z "$checkString" ] then return @@ -175,3 +197,213 @@ generateNewDBAPassword() { writeNewPassword $NewPasswd } + +#------------------------------------------------------------------------ +# change init.d RunUser + +changeInitRunUser() { + NewUser=$1 + + InitFile=`getInitScriptLocation` + if [ -f "$InitFile" ] + then + editFile "$InitFile" FBRunUser "FBRunUser=$NewUser" + chmod u=rwx,g=rx,o= "$InitFile" + fi +} + + +#------------------------------------------------------------------------ +# installInitdScript +# Everbody stores this one in a seperate location, so there is a bit of +# running around to actually get it for each packager. +# Update rcX.d with Firebird initd entries +# initd script for SuSE >= 7.2 is a part of RPM package + +installInitdScript() { + Arch=$1 + if [ "$Arch" != super ]; then + return 0 + fi + + srcScript="" + initScript= + +# This is for RH and MDK specific + + if [ -e /etc/rc.d/init.d/functions ] + then + srcScript=firebird.init.d.mandrake + initScript=/etc/rc.d/init.d/firebird + +# SuSE specific + + elif [ -r /etc/SuSE-release ] + then + srcScript=firebird.init.d.suse + initScript=/etc/init.d/firebird + rm -f /usr/sbin/rcfirebird + ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird + +# Debian specific + + elif [ -r /etc/debian_version ] + then + srcScript=firebird.init.d.debian + initScript=/etc/init.d/firebird + rm -f /usr/sbin/rcfirebird + ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird + +# Slackware specific + + elif [ -r /etc/slackware-version ] + then + srcScript=firebird.init.d.slackware + initScript=/etc/rc.d/rc.firebird + rclocal=/etc/rc.d/rc.local + if ! grep -q "$initScript" $rclocal + then + cat >>$rclocal < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# The post install script for Firebird Server + + + +# Detect which linux distro we are installing on +detectDistro + +# Make sure the links are in place +if [ -z "$FirebirdInstallPrefix" ]; then + FirebirdInstallPrefix=@prefix@ +fi + +origDir=`pwd` + +# Update /etc/services +newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" +replaceLineInFile /etc/services "$newLine" "^gds_db" + +# add Firebird user +if [ $RunUser = firebird ]; then + addFirebirdUser +fi + +# Create the fbmgr shell script. +if [ -x $FBBin/fbmgr.bin ]; then + cat > $FBBin/fbmgr < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# The post uninstall routine for Firebird Server. + + +if [ "$1"=0 ] +then + removeLinksForBackCompatibility + removeServiceAutostart + removeInetdServiceEntry +fi + +if [ -d $PidDir ] +then + rm -rf $PidDir +fi diff --git a/builds/install/arch-specific/linux/misc/preinstall.sh.in b/builds/install/arch-specific/linux/misc/preinstall.sh.in new file mode 100644 index 0000000000..4415d0be06 --- /dev/null +++ b/builds/install/arch-specific/linux/misc/preinstall.sh.in @@ -0,0 +1,72 @@ +#!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + + +# The pre install routine for Firebird Server + + + +#------------------------------------------------------------------------ +# Check for installed RPM package + +# (Pavel I've left this in since originally I could test for other packages, +# even if they did not conflict with current ones, ie we can test InterBase +# and CS/SS The package manager does not allow it currently but I've left +# this in in case that sort of thing gets allowed again + +#checkForRPMInstall() { +# PackageName=$1 +# +# rpm -q $PackageName +# STATUS=$? +# if [ $STATUS -eq 0 ] +# then +# echo "Previous version of $PackageName is detected on your system." +# echo "this will conflict with the current install of Firebird" +# echo "Please unistall the previous version `rpm -q $PackageName` and then proceed." +# exit $STATUS +# fi +# +#} + +# Ok so any of the following packages are a problem +# these don't work at least in the latest rpm manager, since it +# has the rpm database locked and it fails. +# checkForRPMInstall InterBase +# checkForRPMInstall FirebirdCS +# checkForRPMInstall FirebirdSS + +# That test in general package is wrong also due to the fact that it does not check +# for presence of rpm in the system - there are many rpm-less distros. +# I keep it here commented just in order not to loose it in CVS archives. AP - 2008. + + + +#= Main PreInstall ========================================================= + +# It's good ide not to have running firebird/interbase instances +checkIfServerRunning + +# Archive any files we find +archivePriorInstallSystemFiles diff --git a/builds/install/arch-specific/linux/misc/preuninstall.sh.in b/builds/install/arch-specific/linux/misc/preuninstall.sh.in new file mode 100644 index 0000000000..2f47330512 --- /dev/null +++ b/builds/install/arch-specific/linux/misc/preuninstall.sh.in @@ -0,0 +1,44 @@ +#! /bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# The pre uninstall routines for Firebird Server + +checkIfServerRunning + +cd $FBRootDir + +if [ -f $SecurityDatabase ]; then + cp $SecurityDatabase /tmp + echo "Saved a copy of SecurityDatabase ($SecurityDatabase) in /tmp" + chown root:root /tmp/$SecurityDatabase + chmod 0600 /tmp/$SecurityDatabase +fi + +for i in isc_*1* firebird.log SYSDBA.password; do + if [ -f $i ]; then + rm -f $i + fi +done + +rm -f $FBBin/fbmgr diff --git a/builds/install/arch-specific/linux/misc/superLinux.sh.in b/builds/install/arch-specific/linux/misc/superLinux.sh.in deleted file mode 100644 index e59cfbb8d9..0000000000 --- a/builds/install/arch-specific/linux/misc/superLinux.sh.in +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh - - -#------------------------------------------------------------------------ -# change init.d RunUser - -changeInitRunUser() { - NewUser=$1 - - InitFile=`getInitScriptLocation` - if [ -f "$InitFile" ] - then - editFile "$InitFile" FBRunUser "FBRunUser=$NewUser" - chmod u=rwx,g=rx,o= "$InitFile" - fi -} - - -#------------------------------------------------------------------------ -# installInitdScript -# Everbody stores this one in a seperate location, so there is a bit of -# running around to actually get it for each packager. -# Update rcX.d with Firebird initd entries -# initd script for SuSE >= 7.2 is a part of RPM package - -installInitdScript() { - - srcScript="" - initScript= - -# This is for RH and MDK specific - - if [ -e /etc/rc.d/init.d/functions ] - then - srcScript=firebird.init.d.mandrake - initScript=/etc/rc.d/init.d/firebird - -# SuSE specific - - elif [ -r /etc/SuSE-release ] - then - srcScript=firebird.init.d.suse - initScript=/etc/init.d/firebird - rm -f /usr/sbin/rcfirebird - ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird - -# Debian specific - - elif [ -r /etc/debian_version ] - then - srcScript=firebird.init.d.debian - initScript=/etc/init.d/firebird - rm -f /usr/sbin/rcfirebird - ln -s ../../etc/init.d/firebird /usr/sbin/rcfirebird - -# Slackware specific - - elif [ -r /etc/slackware-version ] - then - srcScript=firebird.init.d.slackware - initScript=/etc/rc.d/rc.firebird - rclocal=/etc/rc.d/rc.local - if ! grep -q "$initScript" $rclocal - then - cat >>$rclocal < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# Install script for FirebirdSQL database engine +# http://www.firebirdsql.org + + +InteractiveInstall=1 +export InteractiveInstall + + +checkInstallUser + +BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ +PackageVersion=@FIREBIRD_PACKAGE_VERSION@ +CpuType=@CPU_TYPE@ + +Version="$BuildVersion-$PackageVersion.$CpuType" + + +cat < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# UnInstall script for FirebirdSQL database engine +# http://www.firebirdsql.org + + +InteractiveInstall=1 +export InteractiveInstall + + +checkInstallUser + +BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ +PackageVersion=@FIREBIRD_PACKAGE_VERSION@ +CpuType=@CPU_TYPE@ + +FBRootDir=@prefix@ + +Version="$BuildVersion-$PackageVersion.$CpuType" + + +cat < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + +# The way this works is that the buildroot file is stored relative to the root +# directory and a tar -xzof at root directory will restore all the files in +# the position that we want them to be + +OrigDir=`pwd` + +cd / + +tar -xzof "$OrigDir/buildroot.tar.gz" + +cd "$OrigDir" diff --git a/builds/install/arch-specific/linux/misc/taruninstall.sh.in b/builds/install/arch-specific/linux/misc/taruninstall.sh.in new file mode 100644 index 0000000000..a0ad3fd1fe --- /dev/null +++ b/builds/install/arch-specific/linux/misc/taruninstall.sh.in @@ -0,0 +1,28 @@ +#! /bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# + + +removeInstalledFiles # Remove installed files +removeUninstallFiles # Remove the 'uninstall' utility files +removeEmptyDirs # Remove empty directories diff --git a/builds/install/arch-specific/linux/super/makeInstallImage.sh.in b/builds/install/arch-specific/linux/super/makeInstallImage.sh.in index 30435c7fff..8c58f61fc6 100644 --- a/builds/install/arch-specific/linux/super/makeInstallImage.sh.in +++ b/builds/install/arch-specific/linux/super/makeInstallImage.sh.in @@ -1,37 +1,28 @@ #!/bin/sh -# This library is part of the FirebirdSQL project # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# +# This library is part of the FirebirdSQL project # Script to copy install files from the build/transport area @@ -65,7 +56,7 @@ addLibs() { rm -f $libTarget touch $libTarget - for i in posixLibrary.sh superLibrary.sh linuxLibrary.sh superLinux.sh + for i in posixLibrary.sh superLibrary.sh linuxLibrary.sh do echo "# $i" >>$libTarget cat $libSdir/$i >>$libTarget diff --git a/builds/install/arch-specific/linux/super/postinstall.sh.in b/builds/install/arch-specific/linux/super/postinstall.sh.in deleted file mode 100644 index 0644cfba10..0000000000 --- a/builds/install/arch-specific/linux/super/postinstall.sh.in +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# This runs after firebird archive is opened - -origDir=`pwd` - - -# Update /etc/services -newLine="gds_db 3050/tcp # Firebird SQL Database Remote Protocol" -replaceLineInFile /etc/services "$newLine" "^gds_db" - -# Update ownership of files -if [ $RunUser = firebird ] -then - # Prepare firebird user - addFirebirdUser -fi - -# Create the fbmgr shell script. -cat > $FBBin/fbmgr < -# -# Contributor(s): -# -# -# $Id: tarMainInstall.sh.in,v 1.3 2005-05-27 22:15:13 asfernandes Exp $ -# - -# Install script for FirebirdSQL database engine -# http://www.firebirdsql.org - -# This is the new file !!! - - -#== Main Program ========================================================== - - -InteractiveInstall=1 -export InteractiveInstall - - -checkInstallUser - -BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ -PackageVersion=@FIREBIRD_PACKAGE_VERSION@ -CpuType=@CPU_TYPE@ - -Version="$BuildVersion-$PackageVersion.$CpuType" - - -cat < -# -# Contributor(s): -# -# -# $Id: tarMainUninstall.sh.in,v 1.3 2005-05-27 22:15:13 asfernandes Exp $ -# - -# Install script for FirebirdSQL database engine -# http://www.firebirdsql.org - -# This is the new file !!! - - - -#== Main Program ========================================================== - - -InteractiveInstall=1 -export InteractiveInstall - - -checkInstallUser - -BuildVersion=@FIREBIRD_VERSION@.@FB_BUILD_NUM@ -PackageVersion=@FIREBIRD_PACKAGE_VERSION@ -CpuType=@CPU_TYPE@ - -FBRootDir=@prefix@ - -Version="$BuildVersion-$PackageVersion.$CpuType" - - -cat < -# -# Contributor(s): -# -# -# - -# THe way this works is that the buildroot file is stored relative to the root -# directory and a tar -xzof at root directory will restore all the files in -# the position that we want them to be - -OrigDir=`pwd` - -cd / - -tar -xzof "$OrigDir/buildroot.tar.gz" - -cd "$OrigDir" diff --git a/builds/install/arch-specific/linux/super/taruninstall.sh.in b/builds/install/arch-specific/linux/super/taruninstall.sh.in deleted file mode 100644 index b7b976cc5b..0000000000 --- a/builds/install/arch-specific/linux/super/taruninstall.sh.in +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -# -# This library is part of the FirebirdSQL project -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: taruninstall.sh.in,v 1.4 2005-08-16 10:04:13 alexpeshkoff Exp $ -# - - -removeInstalledFiles # Remove installed files -removeUninstallFiles # Remove the 'uninstall' utility files -removeEmptyDirs # Remove empty directories diff --git a/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in b/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in index 9078cc405d..785edbdef3 100644 --- a/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in +++ b/builds/install/misc/changeGdsLibraryCompatibleLink.sh.in @@ -1,39 +1,26 @@ #!/bin/sh # -# This library is part of the Firebird project +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. -# -# Created by: Mark O'Donohue -# -# Contributor(s): -# -# -# $Id: changeGdsLibraryCompatibleLink.sh.in,v 1.3 2005-08-16 10:03:22 alexpeshkoff Exp $ -# - # This script allows the user to change the link on classic for the # client library from diff --git a/builds/install/misc/changeMultiConnectMode.sh.in b/builds/install/misc/changeMultiConnectMode.sh.in new file mode 100644 index 0000000000..baf7f0adf1 --- /dev/null +++ b/builds/install/misc/changeMultiConnectMode.sh.in @@ -0,0 +1,65 @@ +#!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Alex Peshkoff +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) 2008 Alex Peshkoff +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# + +#= Main ==================================================================== + +FBRootDir=/opt/firebird.CS.2.5 +FBBin=$FBRootDir/bin + +cat < +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# # A routine to change the user that runs interbase Firebird diff --git a/builds/install/misc/classicLibrary.sh.in b/builds/install/misc/classicLibrary.sh.in index 7f5b842b66..42591be23e 100644 --- a/builds/install/misc/classicLibrary.sh.in +++ b/builds/install/misc/classicLibrary.sh.in @@ -1,4 +1,26 @@ #!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# #------------------------------------------------------------------------ # init defaults @@ -155,21 +177,3 @@ updateInetdServiceEntry() { updateInetdEntry fi } - - -#------------------------------------------------------------------------ -# change init.d RunUser - -changeInitRunUser() { - # do nothing for CS - return 0 -} - - -#------------------------------------------------------------------------ -# start init.d service - -startService() { - # do nothing for CS - return 0 -} diff --git a/builds/install/misc/fb_config.in b/builds/install/misc/fb_config.in index 11324d1846..b9869fe540 100644 --- a/builds/install/misc/fb_config.in +++ b/builds/install/misc/fb_config.in @@ -1,34 +1,24 @@ #! /bin/sh # -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# You may obtain a copy of the Licence at -# http://www.gnu.org/licences/lgpl.html -# -# As a special exception this file can also be included in modules -# with other source code as long as that source code has been -# released under an Open Source Initiative certificed licence. -# More information about OSI certification can be found at: -# http://www.opensource.org -# -# This module is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public Licence for more details. -# -# This module was created by members of the firebird development -# team. All individual contributions remain the Copyright (C) of -# those individuals and all rights are reserved. Contributors to -# this file are either listed below or can be obtained from a CVS -# history command. +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. # -# Created by: Mark O'Donohue +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. # -# Contributor(s): -# -# $Id: fb_config.in,v 1.2 2005-05-27 22:15:57 asfernandes Exp $ +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. # # stored configuration values diff --git a/builds/install/misc/posixLibrary.sh.in b/builds/install/misc/posixLibrary.sh.in index 11241aaa11..9b7c43a107 100644 --- a/builds/install/misc/posixLibrary.sh.in +++ b/builds/install/misc/posixLibrary.sh.in @@ -1,4 +1,26 @@ #!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# #------------------------------------------------------------------------ @@ -173,6 +195,15 @@ checkIfServerRunning() { # Check is server is being actively used. + checkString=`ps -eaf | egrep "\b(fb_smp_server)\b" |grep -v grep` + + if [ ! -z "$checkString" ] + then + echo "An instance of the Firebird SuperClassic server seems to be running." + echo "Please quit all Firebird applications and then proceed." + exit 1 + fi + checkString=`ps -eaf | egrep "\b(fbserver|fbguard)\b" |grep -v grep` if [ ! -z "$checkString" ] @@ -216,13 +247,6 @@ checkIfServerRunning() { removeInetdServiceEntry -# Stop lock manager if it is the only thing running. - - for i in `ps -eaf | grep "fb_lock_mgr" | grep -v "grep" | awk '{print $2}' ` - do - kill $i - done - } @@ -359,7 +383,7 @@ EOT cat <>$DBAPasswordFile # Your password can be changed to a more suitable one using the -# @prefix@/bin/changeDBAPassword.sh script +# @prefix@/bin/gsec utility. EOT chmod u=r,go= $DBAPasswordFile diff --git a/builds/install/misc/restoreRootRunUser.sh.in b/builds/install/misc/restoreRootRunUser.sh.in index 21d072d29e..f7b5ec5e0c 100644 --- a/builds/install/misc/restoreRootRunUser.sh.in +++ b/builds/install/misc/restoreRootRunUser.sh.in @@ -1,4 +1,26 @@ #!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# # A routine to change the user that runs interbase Firebird diff --git a/builds/install/misc/superLibrary.sh.in b/builds/install/misc/superLibrary.sh.in index a9a45fec6b..dd93475646 100644 --- a/builds/install/misc/superLibrary.sh.in +++ b/builds/install/misc/superLibrary.sh.in @@ -1,4 +1,26 @@ #!/bin/sh +# +# The contents of this file are subject to the Initial +# Developer's Public License Version 1.0 (the "License"); +# you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# http://www.ibphoenix.com/main.nfs?a=ibphoenix&page=ibp_idpl. +# +# Software distributed under the License is distributed AS IS, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. +# See the License for the specific language governing rights +# and limitations under the License. +# +# The Original Code was created by Mark O'Donohue +# for the Firebird Open Source RDBMS project. +# +# Copyright (c) Mark O'Donohue +# and all contributors signed below. +# +# All Rights Reserved. +# Contributor(s): ______________________________________. +# Alex Peshkoff +# #------------------------------------------------------------------------ # init defaults