From svn-commits at oss.oracle.com Mon May 15 16:10:59 2006 From: svn-commits at oss.oracle.com (svn-commits@oss.oracle.com) Date: Mon, 15 May 2006 16:10:59 -0500 Subject: [Xedeb-commits] jlbec commits r33 - trunk/debian/client Message-ID: Author: jlbec Date: 2006-05-15 16:10:58 -0500 (Mon, 15 May 2006) New Revision: 33 Modified: trunk/debian/client/changelog trunk/debian/client/postinst trunk/debian/client/postrm trunk/debian/client/preinst Log: Make the client work on reinstalls/upgrades. Modified: trunk/debian/client/changelog =================================================================== --- trunk/debian/client/changelog 2006-02-24 15:00:53 UTC (rev 32) +++ trunk/debian/client/changelog 2006-05-15 21:10:58 UTC (rev 33) @@ -1,3 +1,9 @@ +oracle-xe-client (10.2.0.1-1.1) unstable; urgency=low + + * Fix a bug with adding the oracle userid. + + -- Joel Becker Mon, 17 Apr 2006 15:55:40 -0800 + oracle-xe-client (10.2.0.1-1.0) unstable; urgency=low * Release Modified: trunk/debian/client/postinst =================================================================== --- trunk/debian/client/postinst 2006-02-24 15:00:53 UTC (rev 32) +++ trunk/debian/client/postinst 2006-05-15 21:10:58 UTC (rev 33) @@ -1,66 +1,86 @@ #!/bin/sh -#DEBHELPER# +if [ "$1" != "configure" ] +then + exit 0 +fi -echo "Executing Post-install steps.........." -if `grep -q ^dba: /etc/group` +if [ -z "$2" ] then - echo "" + MODE=install else - /usr/sbin/groupadd dba + MODE=upgrade fi -check=`id oracle` -if test -n "$check" + +#DEBHELPER# + +if [ "$MODE" = "install" ] then - group=`groups oracle | grep dba` - if test -z "$group" - then - /usr/sbin/usermod -G dba oracle - fi -else - /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle + echo "Executing Post-install steps.........." + if `grep -q ^dba: /etc/group` + then + echo "" + else + /usr/sbin/groupadd dba + fi + + id oracle >/dev/null 2>&1 + status=$? + if test $status -eq 0 + then + groups oracle | grep dba >/dev/null + status=$? + if test $status != 0 + then + /usr/sbin/usermod -G dba oracle + fi + else + /usr/sbin/useradd -g dba -d /usr/lib/oracle/xe -s /bin/bash oracle + fi + +# End MODE=install fi -#if `grep -q oraclexe /etc/passwd` -#then -# /usr/sbin/usermod -G dba oraclexe -#else -# /usr/sbin/useradd -M -g dba -d /usr/lib/oracle/xe -s /bin/bash oraclexe -#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 -# Start Menu icons +if [ "$MODE" = "install" ] +then + # Start Menu icons -mergefile() -{ - MENUFILE="$1" + mergefile() + { + MENUFILE="$1" - if [ -z "$MENUFILE" ] + if [ -z "$MENUFILE" ] + then + return + fi + + TFILE="$(mktemp)" || TFILE="/tmp/xeapplications.tmp" + (sed -n '1,/<\/Menu>/p' "$MENUFILE" ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' "$MENUFILE" ) > "$TFILE" + cp -f "$TFILE" "$MENUFILE" + rm -f "$TFILE" + } + + if [ -f /etc/xdg/menus/gnome-applications.menu ] then - return + mergefile /etc/xdg/menus/gnome-applications.menu fi + if [ -f /etc/xdg/menus/kde-applications.menu ] + then + mergefile /etc/xdg/menus/kde-applications.menu + fi + if [ -f /etc/xdg/menus/applications.menu ] + then + mergefile /etc/xdg/menus/applications.menu + fi - TFILE="$(mktemp)" || TFILE="/tmp/xeapplications.tmp" - (sed -n '1,/<\/Menu>/p' "$MENUFILE" ; cat /usr/lib/oracle/xe/app/oracle/product/10.2.0/client/scripts/oraclexe-client-merge.menu ; sed -n '1,/<\/Menu>/!p' "$MENUFILE" ) > "$TFILE" - cp -f "$TFILE" "$MENUFILE" - rm -f "$TFILE" -} - -if [ -f /etc/xdg/menus/gnome-applications.menu ] -then - mergefile /etc/xdg/menus/gnome-applications.menu +# End MODE=install fi -if [ -f /etc/xdg/menus/kde-applications.menu ] -then - mergefile /etc/xdg/menus/kde-applications.menu -fi -if [ -f /etc/xdg/menus/applications.menu ] -then - mergefile /etc/xdg/menus/applications.menu -fi - - + + rm -fr /usr/lib/oracle/screenrc rm -fr /usr/lib/oracle/gtkrc rm -fr /usr/lib/oracle/emacs Modified: trunk/debian/client/postrm =================================================================== --- trunk/debian/client/postrm 2006-02-24 15:00:53 UTC (rev 32) +++ trunk/debian/client/postrm 2006-05-15 21:10:58 UTC (rev 33) @@ -1,14 +1,28 @@ #!/bin/sh +case "$1" in +remove|purge) + ;; +*) + exit 0 + ;; +esac + #DEBHELPER# -rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/client -rm -fr /usr/lib/oracle/xe/app/oracle/doc -rm -fr /usr/share/desktop-menu-files/oraclexe-client-10g.directory -rm -fr /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory -rm -fr /var/lib/menu/kde/Applications/oraclexe-client -rm -fr /usr/share/gnome/vfolders/oraclexe-client-10g.directory -rm -fr /usr/share/gnome/vfolders/oraclexe-client-gethelp.directory +case "$1" in +purge) + rm -fr /usr/lib/oracle/xe/app/oracle/product/10.2.0/client + rm -fr /usr/lib/oracle/xe/app/oracle/doc + rm -fr /usr/share/desktop-menu-files/oraclexe-client-10g.directory + rm -fr /usr/share/desktop-menu-files/oraclexe-client-gethelp.directory + rm -fr /var/lib/menu/kde/Applications/oraclexe-client + rm -fr /usr/share/gnome/vfolders/oraclexe-client-10g.directory + rm -fr /usr/share/gnome/vfolders/oraclexe-client-gethelp.directory + ;; +*) + ;; +esac mergefile() { Modified: trunk/debian/client/preinst =================================================================== --- trunk/debian/client/preinst 2006-02-24 15:00:53 UTC (rev 32) +++ trunk/debian/client/preinst 2006-05-15 21:10:58 UTC (rev 33) @@ -1,5 +1,10 @@ #!/bin/sh +if [ "$1" != "install" -o -n "$2" ] +then + exit 0 +fi + #DEBHELPER# #User must be root From svn-commits at oss.oracle.com Mon May 15 16:11:27 2006 From: svn-commits at oss.oracle.com (svn-commits@oss.oracle.com) Date: Mon, 15 May 2006 16:11:27 -0500 Subject: [Xedeb-commits] jlbec commits r34 - in trunk/debian: client server server-universal Message-ID: Author: jlbec Date: 2006-05-15 16:11:26 -0500 (Mon, 15 May 2006) New Revision: 34 Modified: trunk/debian/client/control trunk/debian/server-universal/control trunk/debian/server/ trunk/debian/server/control Log: Add bc(1) to the dependancy lists. Modified: trunk/debian/client/control =================================================================== --- trunk/debian/client/control 2006-05-15 21:10:58 UTC (rev 33) +++ trunk/debian/client/control 2006-05-15 21:11:26 UTC (rev 34) @@ -7,7 +7,7 @@ Package: oracle-xe-client Architecture: i386 -Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96) +Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96), bc Section: misc Conflicts: Description: Oracle Client 10g Express Edition Property changes on: trunk/debian/server ___________________________________________________________________ Name: svn:ignore - oracle-xe oracle-xe.init tmp *.debhelper files + oracle-xe oracle-xe.init tmp *.debhelper files .*.sw? Modified: trunk/debian/server/control =================================================================== --- trunk/debian/server/control 2006-05-15 21:10:58 UTC (rev 33) +++ trunk/debian/server/control 2006-05-15 21:11:26 UTC (rev 34) @@ -7,7 +7,7 @@ Package: oracle-xe Architecture: i386 -Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96) +Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96), bc Section: misc Conflicts: oracle-xe-universal Description: Oracle Database 10g Express Western European Edition Modified: trunk/debian/server-universal/control =================================================================== --- trunk/debian/server-universal/control 2006-05-15 21:10:58 UTC (rev 33) +++ trunk/debian/server-universal/control 2006-05-15 21:11:26 UTC (rev 34) @@ -7,7 +7,7 @@ Package: oracle-xe-universal Architecture: i386 -Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96) +Depends: libc6 (>= 2.3.2), libaio (>= 0.3.96) | libaio1 (>=0.3.96), bc Section: misc Conflicts: oracle-xe Description: Oracle Database 10g Express Universal Edition