|
Removed
Link Here
|
| 1 |
--- src/install/arch-specific/freebsd/install.sh.in.orig Thu Nov 6 23:23:29 2003 |
| 2 |
+++ src/install/arch-specific/freebsd/install.sh.in Tue Jan 13 17:36:16 2004 |
| 3 |
@@ -59,7 +59,7 @@ |
| 4 |
if [ -d $InstallPrefix/firebird.old ]; then |
| 5 |
rm -rf $InstallPrefix/firebird.old |
| 6 |
fi |
| 7 |
- mv $InstallFirebirdPrefix $InstallPrefix/firebird.old |
| 8 |
+ cp -Rp $InstallFirebirdPrefix $InstallPrefix/firebird.old |
| 9 |
fi |
| 10 |
|
| 11 |
if [ `id -u` -ne 0 ]; then |
| 12 |
@@ -162,7 +162,7 @@ |
| 13 |
#cp -r $BuiltFBDir/doc $DestDir |
| 14 |
|
| 15 |
cp $BuiltFBDir/firebird.msg $DestDir/firebird.msg |
| 16 |
-cp $BuiltFBDir/security.fdb $DestDir/security.fdb |
| 17 |
+cp $BuiltFBDir/security.fdb $DestDir/security.fdb.sample |
| 18 |
|
| 19 |
|
| 20 |
#cp $BuiltFBDir/include/gds.f $DestDir/include |
| 21 |
@@ -190,19 +190,19 @@ |
| 22 |
cp $BuildRootDir/doc/WhatsNew $DestDir/WhatsNew |
| 23 |
cp $BuildRootDir/doc/README.user $DestDir/README |
| 24 |
|
| 25 |
-cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf |
| 26 |
+cp $BuiltFBDir/misc/firebird.conf $DestDir/firebird.conf.sample |
| 27 |
|
| 28 |
-echo "#" >> $DestDir/aliases.conf |
| 29 |
-echo "# List of known database aliases" >> $DestDir/aliases.conf |
| 30 |
-echo "# ------------------------------" >> $DestDir/aliases.conf |
| 31 |
-echo "#" >> $DestDir/aliases.conf |
| 32 |
-echo "# Examples:" >> $DestDir/aliases.conf |
| 33 |
-echo "#" >> $DestDir/aliases.conf |
| 34 |
-echo "# employee = /$FBRootDir/examples/employee.fdb" >> $DestDir/aliases.conf |
| 35 |
-echo "#" >> $DestDir/aliases.conf |
| 36 |
+echo "#" >> $DestDir/aliases.conf.sample |
| 37 |
+echo "# List of known database aliases" >> $DestDir/aliases.conf.sample |
| 38 |
+echo "# ------------------------------" >> $DestDir/aliases.conf.sample |
| 39 |
+echo "#" >> $DestDir/aliases.conf.sample |
| 40 |
+echo "# Examples:" >> $DestDir/aliases.conf.sample |
| 41 |
+echo "#" >> $DestDir/aliases.conf.sample |
| 42 |
+echo "# employee = $DestDir/examples/employee.fdb" >> $DestDir/aliases.conf.sample |
| 43 |
+echo "#" >> $DestDir/aliases.conf.sample |
| 44 |
|
| 45 |
|
| 46 |
-chown -R firebird:firebird $InstallFirebirdPrefix |
| 47 |
+chown -R $fbUID:$fbGID $InstallFirebirdPrefix |
| 48 |
chmod -R o= $InstallFirebirdPrefix |
| 49 |
|
| 50 |
# Now fix up the mess. |
| 51 |
@@ -235,8 +235,8 @@ |
| 52 |
chmod -R a=rx $InstallFirebirdPrefix/lib/* |
| 53 |
|
| 54 |
cd $InstallFirebirdPrefix/lib |
| 55 |
-ln -sf libfbclient.so libgds.so |
| 56 |
-ln -sf libfbclient.so.1 libgds.so.1 |
| 57 |
+ln -sf libfbembed.so libgds.so |
| 58 |
+ln -sf libfbembed.so.1 libgds.so.1 |
| 59 |
|
| 60 |
cd $InstallFirebirdPrefix/bin |
| 61 |
for i in `ls` |
| 62 |
@@ -265,19 +265,25 @@ |
| 63 |
FileName=$i.`hostname` |
| 64 |
touch $FileName |
| 65 |
chmod ug=rw,o= $FileName |
| 66 |
- chown firebird:firebird $FileName |
| 67 |
+ chown $fbUID:$fbGID $FileName |
| 68 |
done |
| 69 |
|
| 70 |
-touch firebird.log aliases.conf firebird.conf |
| 71 |
-chown firebird:firebird firebird.log |
| 72 |
+touch firebird.log |
| 73 |
+chown $fbUID:$fbGID firebird.log |
| 74 |
chmod ug=rw,o= firebird.log |
| 75 |
-chmod a=r firebird.msg aliases.conf firebird.conf README |
| 76 |
+chmod a=r firebird.msg README |
| 77 |
+chown root:wheel *.sample |
| 78 |
+chmod ug=r,o= *.sample |
| 79 |
|
| 80 |
# make databases writable by firebird only |
| 81 |
# local database connections are not a good idea |
| 82 |
chmod ug=rw,o= examples/*.fdb |
| 83 |
chmod ug=rw,o= help/*.fdb |
| 84 |
-chmod ug=rw,o= security.fdb |
| 85 |
+ |
| 86 |
+# install the samples if they don't exist |
| 87 |
+[ -f aliases.conf ] || install -o $fbUID -g $fbGID -m 444 aliases.conf.sample aliases.conf |
| 88 |
+[ -f firebird.conf ] || install -o $fbUID -g $fbGID -m 444 firebird.conf.sample firebird.conf |
| 89 |
+[ -f security.fdb ] || install -o $fbUID -g $fbGID -m 660 security.fdb.sample security.fdb |
| 90 |
|
| 91 |
# remove any existing gds service |
| 92 |
cp /etc/services /etc/services.old |