summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2005-01-21 10:35:16 +0000
committerKurt Zenker <kz@openoffice.org>2005-01-21 10:35:16 +0000
commit38b16ea871ee575ad9aaed896455881d293792ec (patch)
tree9d3b8bb07a3f2b3ddcafb53aff448df051a6a8bc
parent12f7ffcd42cb67c82602e400af3b71600b171afc (diff)
INTEGRATION: CWS sysui03 (1.4.2); FILE MERGED
2005/01/14 07:08:53 obr 1.4.2.1: #i39410# check for gnome packages and other enhancements
-rw-r--r--setup_native/scripts/uninstall_solaris.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/setup_native/scripts/uninstall_solaris.sh b/setup_native/scripts/uninstall_solaris.sh
index 1fd417505..65dddb596 100644
--- a/setup_native/scripts/uninstall_solaris.sh
+++ b/setup_native/scripts/uninstall_solaris.sh
@@ -20,7 +20,7 @@ DIRECTORY=`pwd`
ADMINFILE=$DIRECTORY/admin
GETUID_SO=/tmp/getuid.so.$$
linenum=???
-tail +$linenum $0 > $GETUID_SO
+tail +$linenum `basename $0` > $GETUID_SO
PKGLIST=`pkginfo -R $MY_ROOT | cut -f 2 -d ' ' | grep -v core`
COREPKG=`pkginfo -R $MY_ROOT | cut -f 2 -d ' ' | grep core`
@@ -36,12 +36,17 @@ for i in $PKGLIST $COREPKG; do
echo $i
done
+INSTALL_DIR=$MY_ROOT`pkginfo -R $MY_ROOT -r $COREPKG`
+
+# Restore original bootstraprc
+mv -f $INSTALL_DIR/program/bootstraprc.orig $INSTALL_DIR/program/bootstraprc
+
LD_PRELOAD=$GETUID_SO
export LD_PRELOAD
for i in $PKGLIST $COREPKG; do
echo /usr/sbin/pkgrm -a $ADMINFILE -R $MY_ROOT $i
- /usr/sbin/pkgrm -a $ADMINFILE -R $MY_ROOT $i
+ /usr/sbin/pkgrm -n -a $ADMINFILE -R $MY_ROOT $i
done
# Removing old root directory, very dangerous!