[Xedeb-commits] jlbec commits r19 - in trunk: debian/client
debian/server override/server sources
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Dec 15 18:12:58 CST 2005
Author: jlbec
Date: 2005-12-15 16:41:30 -0600 (Thu, 15 Dec 2005)
New Revision: 19
Removed:
trunk/override/server/config/
Modified:
trunk/debian/client/changelog
trunk/debian/client/postinst
trunk/debian/client/preinst
trunk/debian/server/changelog
trunk/debian/server/oracle-xe.install
trunk/debian/server/postinst
trunk/debian/server/postrm
trunk/debian/server/preinst
trunk/sources/oracle-xe-10.2.0.1.tar.gz
trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
trunk/sources/oracle_client.spec
trunk/sources/oracle_server.spec
Log:
o Update against XE changes.
Modified: trunk/debian/client/changelog
===================================================================
--- trunk/debian/client/changelog 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/client/changelog 2005-12-15 22:41:30 UTC (rev 19)
@@ -1,3 +1,9 @@
+oracle-xe-client (10.2.0.1-0.3) unstable; urgency=low
+
+ * Update to 12/13.
+
+ -- Joel Becker <joel.becker at oracle.com> Thu, 15 Dec 2005 12:31:35 -0800
+
oracle-xe-client (10.2.0.1-0.2) unstable; urgency=low
* Fix up the menus
Modified: trunk/debian/client/postinst
===================================================================
--- trunk/debian/client/postinst 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/client/postinst 2005-12-15 22:41:30 UTC (rev 19)
@@ -28,7 +28,7 @@
#fi
/bin/chown -R oracle:dba /usr/lib/oracle/xe
-#chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin/sqlplus
+chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin/sqlplus
# Start Menu icons
Modified: trunk/debian/client/preinst
===================================================================
--- trunk/debian/client/preinst 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/client/preinst 2005-12-15 22:41:30 UTC (rev 19)
@@ -12,35 +12,37 @@
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+# diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib/oracle | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
- if [ $diskspace -lt 200 ]
+ if [ $diskspace -lt 100 ]
then
echo "You have insufficient diskspace in the destination directory (/usr/lib/oracle)
-to install Oracle Database 10g Express Edition. The installation requires at
-least 200 MB free on this disk."
+to install Oracle Client 10g Express Edition. The installation requires at
+least 100 MB free on this disk."
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+# diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
- if [ $diskspace -lt 200 ]
+ if [ $diskspace -lt 100 ]
then
echo "You have insufficient diskspace in the destination directory (/usr/lib) to
-install Oracle Database 10g Express Edition. The installation requires at
-least 200 MB free on this disk."
+install Oracle Client 10g Express Edition. The installation requires at
+least 100 MB free on this disk."
exit 1
fi
fi
-#Check for sufficient SWAP space
+# Check for sufficient SWAP space
space=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
PhyMem=`expr $space / 1024`
swapspace=`free -m | grep Swap | awk '{print $4}'`
if [ $PhyMem -lt 240 ]
then
- echo "Oracle Database 10g Express Edition requires a minimum of 256 MB of physical
+ echo "Oracle Client 10g Express Edition requires a minimum of 256 MB of physical
memory (RAM). This system has $PhyMem MB of RAM and does not meet minimum
requirements."
exit 1
@@ -52,7 +54,7 @@
if [ $swapspace -lt "$required" ]
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
@@ -63,7 +65,7 @@
if [ $swapspace -lt "$required" ]
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
@@ -80,10 +82,19 @@
if test $check != 0
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
fi
+elif [ $PhyMem -gt 1024 ]
+then
+ if [ $swapspace -lt 1024 ]
+ then
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Client 10g
+Express Edition requires 1024 MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
+ fi
fi
Modified: trunk/debian/server/changelog
===================================================================
--- trunk/debian/server/changelog 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/server/changelog 2005-12-15 22:41:30 UTC (rev 19)
@@ -1,3 +1,9 @@
+oracle-xe (10.2.0.1-0.5) unstable; urgency=low
+
+ * Sync up latest XE
+
+ -- Joel Becker <joel.becker at oracle.com> Thu, 08 Dec 2005 09:47:35 -0800
+
oracle-xe (10.2.0.1-0.4) unstable; urgency=low
* Fix up the menu files to install properly.
Modified: trunk/debian/server/oracle-xe.install
===================================================================
--- trunk/debian/server/oracle-xe.install 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/server/oracle-xe.install 2005-12-15 22:41:30 UTC (rev 19)
@@ -4,7 +4,6 @@
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/dbs
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/demo
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/hs
-debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/install
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jdbc
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jlib
debian/tmp/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ldap
Modified: trunk/debian/server/postinst
===================================================================
--- trunk/debian/server/postinst 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/server/postinst 2005-12-15 22:41:30 UTC (rev 19)
@@ -85,8 +85,8 @@
/bin/sed -i "s/%sga_target%/$sga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
/bin/sed -i "s/%pga_aggregate_target%/$pga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
-chmod 6751 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle
-chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/sqlplus
+/bin/chmod 6751 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle
+/bin/chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/sqlplus
# Start Menu icons
Modified: trunk/debian/server/postrm
===================================================================
--- trunk/debian/server/postrm 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/server/postrm 2005-12-15 22:41:30 UTC (rev 19)
@@ -11,17 +11,30 @@
fi
rm -fr /etc/default/oracle-xe
-rm -fr /usr/lib/oracle/xe/oradata/XE
-rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
-rm -fr /usr/lib/oracle/xe/app/oracle/flash_recovery_area
-rm -fr /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+
+if test -d /usr/lib/oracle/xe/oradata/XE
+then
+ rm -fr /usr/lib/oracle/xe/oradata/XE
+fi
+if test -d /usr/lib/oracle/xe/app/oracle/admin/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
+fi
+if test -d /usr/lib/oracle/xe/app/oracle/flash_recovery_area/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/flash_recovery_area/XE
+fi
+
+if test -d /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+fi
+
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server
rm -fr /usr/lib/oracle/xe/app/oracle/doc
rm -fr /usr/share/desktop-menu-files/oraclexe-10g.directory
rm -fr /usr/share/desktop-menu-files/oraclexe-gethelp.directory
rm -fr /var/lib/menu/kde/Applications/OracleXE
-#rm -fr /var/lib/menu/kde/Applications/oraclexe-OracleXE.directory
-#rm -fr /var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-10g.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-gethelp.directory
Modified: trunk/debian/server/preinst
===================================================================
--- trunk/debian/server/preinst 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/debian/server/preinst 2005-12-15 22:41:30 UTC (rev 19)
@@ -19,7 +19,7 @@
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib/oracle | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -29,7 +29,7 @@
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -40,7 +40,7 @@
fi
fi
-#Check for sufficient SWAP space
+# Check for sufficient SWAP space
space=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
PhyMem=`expr $space / 1024`
swapspace=`free -m | grep Swap | awk '{print $4}'`
@@ -98,7 +98,7 @@
then
echo "This system does not meet the minimum requirements for swap space. Based on
the amount of physical memory available on the system, Oracle Database 10g
-Express Edition requires $PhyMem MB of swap space. This system has $swapspace MB
+Express Edition requires 1024 MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
fi
fi
@@ -144,28 +144,29 @@
then
echo "###########" >> /etc/sysctl.conf
echo "# Oracle XE Recommended Values" >> /etc/sysctl.conf
-fi
-
-if [ "$change" != "no" ]
-then
+
/sbin/sysctl -w kernel.sem="$semmsl $semmns $semopm $semmni" >> /etc/sysctl.conf
fi
+changeshmmax=no
if [ $shmmax -lt 536870912 ]
then
changeshmmax=yes
fi
+changeshmmni=no
if [ $shmmni -lt 4096 ]
then
changeshmmni=yes
fi
+changeshmall=no
if [ $shmall -lt 2097152 ]
then
changeshmall=yes
fi
+changefilemax=no
if [ $filemax -lt 65536 ]
then
changefilemax=yes
Modified: trunk/sources/oracle-xe-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/sources/oracle-xe-client-10.2.0.1.tar.gz
===================================================================
(Binary files differ)
Modified: trunk/sources/oracle_client.spec
===================================================================
--- trunk/sources/oracle_client.spec 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/sources/oracle_client.spec 2005-12-15 22:41:30 UTC (rev 19)
@@ -32,35 +32,37 @@
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+# diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
- if [ $diskspace -lt 1536 ]
+ if [ $diskspace -lt 100 ]
then
echo "You have insufficient diskspace in the destination directory (/usr/lib/oracle)
-to install Oracle Database 10g Express Edition. The installation requires at
-least 1.5 GB free on this disk."
+to install Oracle Client 10g Express Edition. The installation requires at
+least 100 MB free on this disk."
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+# diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
- if [ $diskspace -lt 1536 ]
+ if [ $diskspace -lt 100 ]
then
echo "You have insufficient diskspace in the destination directory (/usr/lib) to
-install Oracle Database 10g Express Edition. The installation requires at
-least 1.5 GB free on this disk."
+install Oracle Client 10g Express Edition. The installation requires at
+least 100 MB free on this disk."
exit 1
fi
fi
-#Check for sufficient SWAP space
+# Check for sufficient SWAP space
space=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
PhyMem=`expr $space / 1024`
swapspace=`free -m | grep Swap | awk '{print $4}'`
if [ $PhyMem -lt 240 ]
then
- echo "Oracle Database 10g Express Edition requires a minimum of 256 MB of physical
+ echo "Oracle Client 10g Express Edition requires a minimum of 256 MB of physical
memory (RAM). This system has $PhyMem MB of RAM and does not meet minimum
requirements."
exit 1
@@ -72,7 +74,7 @@
if [ $swapspace -lt "$required" ]
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
@@ -83,7 +85,7 @@
if [ $swapspace -lt "$required" ]
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
@@ -100,11 +102,20 @@
if test $check != 0
then
echo "This system does not meet the minimum requirements for swap space. Based on
-the amount of physical memory available on the system, Oracle Database 10g
+the amount of physical memory available on the system, Oracle Client 10g
Express Edition requires $required MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
exit 1
fi
+elif [ $PhyMem -gt 1024 ]
+then
+ if [ $swapspace -lt 1024 ]
+ then
+ echo "This system does not meet the minimum requirements for swap space. Based on
+the amount of physical memory available on the system, Oracle Client 10g
+Express Edition requires 1024 MB of swap space. This system has $swapspace MB
+of swap space. Configure more swap space on the system and retry the installation."
+ fi
fi
@@ -154,7 +165,7 @@
/sbin/ldconfig >/dev/null
/bin/chown -R oracle:dba /usr/lib/oracle/xe
-#chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin/sqlplus
+chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/bin/sqlplus
# Start Menu icons
@@ -218,15 +229,38 @@
cp -r /usr/share/desktop-menu-files/oraclexe-client-10g.directory /usr/share/desktop-directories/oraclexe-client-10g.directory
cp -r /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory /usr/share/desktop-directories/oraclexe-client-gethelp.directory
cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client.menu /etc/xdg/menus
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+ if test -f /tmp/applications.menu.tmp
+ then
+ (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp$$
+ /bin/chmod 664 /tmp/applications.menu.tmp$$
+ cp -rf /tmp/applications.menu.tmp$$ /etc/xdg/menus/applications.menu
+ else
+ (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
+ /bin/chmod 664 /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+ fi
+
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+ if test -f /tmp/applications.menu.tmp
+ then
+ (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp$$
+ /bin/chmod 664 /tmp/applications.menu.tmp$$
+ cp -rf /tmp/applications.menu.tmp$$ /etc/X11/desktop-menus/applications.menu
+ else
+ (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
+ /bin/chmod 664 /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+ fi
+
fi
-rm -fr /tmp/applications.menu.tmp
+if test -f /tmp/applications.menu.tmp
+then
+ rm -fr /tmp/applications.menu.tmp
+else
+ rm -fr /tmp/applications.menu.tmp$$
+fi
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
@@ -255,16 +289,37 @@
rm -fr /usr/share/desktop-directories/oraclexe-client-10g.directory
rm -fr /usr/share/desktop-directories/oraclexe-client-gethelp.directory
rm -r /etc/xdg/menus/oraclexe-client.menu
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+ if test -f /tmp/applications.menu
+ then
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu$$
+ /bin/chmod 664 /tmp/applications.menu$$
+ cp -rf /tmp/applications.menu$$ /etc/xdg/menus/applications.menu
+ else
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
+ /bin/chmod 664 /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+ fi
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+ if test -f /tmp/applications.menu
+ then
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu$$
+ /bin/chmod 664 /tmp/applications.menu$$
+ cp -rf /tmp/applications.menu$$ /etc/X11/desktop-menus/applications.menu
+ else
+ sed -n '/<\!\-- Oracle XE Client \-->/,/<\!\-- End of Oracle XE Client \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
+ /bin/chmod 664 /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+ fi
fi
-rm -fr /tmp/applications.menu
+if test -f /tmp/applications.menu
+then
+ rm -fr /tmp/applications.menu
+else
+ rm -fr /tmp/applications.menu$$
+fi
%files
%defattr(-,root,root)
Modified: trunk/sources/oracle_server.spec
===================================================================
--- trunk/sources/oracle_server.spec 2005-12-09 19:00:48 UTC (rev 18)
+++ trunk/sources/oracle_server.spec 2005-12-15 22:41:30 UTC (rev 19)
@@ -39,7 +39,7 @@
# Check for sufficient diskspace
if [ -d /usr/lib/oracle ]
then
- diskspace=`df -k /usr/lib/oracle | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -49,7 +49,7 @@
exit 1
fi
else
- diskspace=`df -k /usr/lib | grep '^/dev*' | awk '{print $4}'`
+ diskspace=`df -k /usr/lib | grep -v Filesystem | grep % | tr -s " " | cut -d" " -f4`
diskspace=`expr $diskspace / 1024`
if [ $diskspace -lt 1536 ]
then
@@ -60,7 +60,7 @@
fi
fi
-#Check for sufficient SWAP space
+# Check for sufficient SWAP space
space=`cat /proc/meminfo | grep '^MemTotal' | awk '{print $2}'`
PhyMem=`expr $space / 1024`
swapspace=`free -m | grep Swap | awk '{print $4}'`
@@ -118,7 +118,7 @@
then
echo "This system does not meet the minimum requirements for swap space. Based on
the amount of physical memory available on the system, Oracle Database 10g
-Express Edition requires $PhyMem MB of swap space. This system has $swapspace MB
+Express Edition requires 1024 MB of swap space. This system has $swapspace MB
of swap space. Configure more swap space on the system and retry the installation."
fi
fi
@@ -164,34 +164,34 @@
then
echo "###########" >> /etc/sysctl.conf
echo "# Oracle XE Recommended Values" >> /etc/sysctl.conf
-fi
-
-if [ "$change" != "no" ]
-then
/sbin/sysctl -w kernel.sem="$semmsl $semmns $semopm $semmni" >> /etc/sysctl.conf
fi
+changeshmmax=no
if [ $shmmax -lt 536870912 ]
then
- kernel.shmmax="536870912"
+ shmmax=536870912
changeshmmax=yes
fi
+changeshmmni=no
if [ $shmmni -lt 4096 ]
then
- kernel.shmmni="4096"
+ shmmni=4096
changeshmmni=yes
fi
+changeshmall=no
if [ $shmall -lt 2097152 ]
then
- kernel.shmall="2097152"
+ shmall=2097152
changeshmall=yes
fi
+changefilemax=no
if [ $filemax -lt 65536 ]
then
- fs.file-max="65536"
+ filemax=65536
changefilemax=yes
fi
@@ -298,7 +298,7 @@
# /bin/cp /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oracle-xe /etc/rc.d/init.d/oracle-xe
#fi
-chmod 755 /etc/init.d/oracle-xe
+/bin/chmod 755 /etc/init.d/oracle-xe
/sbin/chkconfig --add oracle-xe
# SGA & PGA algo
@@ -348,8 +348,8 @@
/bin/sed -i "s/%sga_target%/$sga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
/bin/sed -i "s/%pga_aggregate_target%/$pga/g" /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/initXETemp.ora
-chmod 6751 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle
-chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/sqlplus
+/bin/chmod 6751 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/oracle
+/bin/chmod 755 /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/bin/sqlplus
# Start Menu icons
@@ -470,16 +470,32 @@
cp -r /usr/share/desktop-menu-files/oraclexe-10g.directory /usr/share/desktop-directories/oraclexe-10g.directory
cp -r /usr/share/desktop-menu-files/oraclexe-gethelp.directory /usr/share/desktop-directories/oraclexe-gethelp.directory
cp -r /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe.menu /etc/xdg/menus
- (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+ if [ -f /tmp/applications.menu.tmp ]
+ then
+ (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp$$
+ /bin/chmod 664 /tmp/applications.menu.tmp$$
+ cp -rf /tmp/applications.menu.tmp$$ /etc/xdg/menus/applications.menu
+ else
+ (sed -n '1,/<\/Menu>/p' /etc/xdg/menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-merge.menu ; sed -n '1,/<\/Menu>/!p' /etc/xdg/menus/applications.menu ) > /tmp/applications.menu.tmp
+ /bin/chmod 664 /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/xdg/menus/applications.menu
+ fi
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
- cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+ if [ -f /tmp/applications.menu.tmp ]
+ then
+ (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp$$
+ /bin/chmod 664 /tmp/applications.menu.tmp$$
+ cp -rf /tmp/applications.menu.tmp$$ /etc/X11/desktop-menus/applications.menu
+ else
+ (sed -n '1,/<\/Query>/p' /etc/X11/desktop-menus/applications.menu ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/server/config/scripts/oraclexe-rhel3.menu ; sed -n '1,/<\/Query>/!p' /etc/X11/desktop-menus/applications.menu ) > /tmp/applications.menu.tmp
+ /bin/chmod 664 /tmp/applications.menu.tmp
+ cp -rf /tmp/applications.menu.tmp /etc/X11/desktop-menus/applications.menu
+ fi
fi
homedir=`echo $HOME`
-if [ "$homedir" == "/root" ]
+if [ "$homedir" = "/root" ]
then
homedir=`sh -c "echo ~$USER"`
fi
@@ -496,7 +512,12 @@
fi
fi
-rm -fr /tmp/applications.menu.tmp
+if test -f /tmp/applications.menu.tmp$$
+then
+ rm -fr /tmp/applications.menu.tmp$$
+else
+ rm -fr /tmp/applications.menu.tmp
+fi
rm -fr /usr/lib/oracle/screenrc
rm -fr /usr/lib/oracle/gtkrc
rm -fr /usr/lib/oracle/emacs
@@ -529,18 +550,31 @@
/bin/rm -f /etc/oratab.xe
fi
-rm -fr /etc/sysconfig/oracle-xe-config
-rm -fr /usr/lib/oracle/xe/oradata/XE
-rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
-rm -fr /usr/lib/oracle/xe/app/oracle/flash_recovery_area
-rm -fr /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+rm -fr /etc/sysconfig/oracle-xe
+
+if test -d /usr/lib/oracle/xe/oradata/XE
+then
+ rm -fr /usr/lib/oracle/xe/oradata/XE
+fi
+if test -d /usr/lib/oracle/xe/app/oracle/admin/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/admin/XE
+fi
+if test -d /usr/lib/oracle/xe/app/oracle/flash_recovery_area/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/flash_recovery_area/XE
+fi
+
+if test -d /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+then
+ rm -fr /usr/lib/oracle/xe/app/oracle/admin/cfgtoollogs/dbca/XE
+fi
+
rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/server
rm -fr /usr/lib/oracle/xe/app/oracle/doc
rm -fr /usr/share/desktop-menu-files/oraclexe-10g.directory
rm -fr /usr/share/desktop-menu-files/oraclexe-gethelp.directory
rm -fr /var/lib/menu/kde/Applications/OracleXE
-#rm -fr /var/lib/menu/kde/Applications/oraclexe-OracleXE.directory
-#rm -fr /var/lib/menu/kde/Applications/oraclexe-GetHelp.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-10g.directory
rm -fr /usr/share/gnome/vfolders/oraclexe-gethelp.directory
if [ -f /etc/xdg/menus/applications.menu ]
@@ -548,18 +582,40 @@
rm -fr /usr/share/desktop-directories/oraclexe-10g.directory
rm -fr /usr/share/desktop-directories/oraclexe-gethelp.directory
rm -r /etc/xdg/menus/oraclexe.menu
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+ if [ -f /tmp/applications.menu ]
+ then
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu$$
+ /bin/chmod 664 /tmp/applications.menu$$
+ cp -rf /tmp/applications.menu$$ /etc/xdg/menus/applications.menu
+ else
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/xdg/menus/applications.menu > /tmp/applications.menu
+ /bin/chmod 664 /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/xdg/menus/applications.menu
+ fi
elif [ -f /etc/X11/desktop-menus/applications.menu ]
then
- sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
- cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+ if [ -f /tmp/applications.menu ]
+ then
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu$$
+ /bin/chmod 664 /tmp/applications.menu$$
+ cp -rf /tmp/applications.menu$$ /etc/X11/desktop-menus/applications.menu
+ else
+ sed -n '/<\!\-- Oracle XE \-->/,/<\!\-- End of Oracle XE \-->/!p' /etc/X11/desktop-menus/applications.menu > /tmp/applications.menu
+ /bin/chmod 664 /tmp/applications.menu
+ cp -rf /tmp/applications.menu /etc/X11/desktop-menus/applications.menu
+
+ fi
fi
-rm -fr /tmp/applications.menu
+if test -f /tmp/applications.menu$$
+then
+ rm -fr /tmp/applications.menu$$
+else
+ rm -fr /tmp/applications.menu
+fi
homedir=`echo $HOME`
-if [ "$homedir" == "/root" ]
+if [ "$homedir" = "/root" ]
then
homedir=`sh -c "echo ~$USER"`
fi
@@ -611,14 +667,12 @@
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/dbs
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/demo
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/hs
-/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/install
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jdbc
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/jlib
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/ldap
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/lib
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/install
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/samples
-/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/admin/shrept.lst
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/mesg
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/lib
/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/network/log
More information about the Xedeb-commits
mailing list