summaryrefslogtreecommitdiff
path: root/setup_native/scripts
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-06-17 13:12:43 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-06-17 13:12:43 +0000
commitf64f8eb5fb7f7a27a45ac8ba377d453b15257af8 (patch)
tree9e1859444a4ad004da83f010375a623ab035ea60 /setup_native/scripts
parent27c6920a0a1423678b5e74d5d315487724640865 (diff)
INTEGRATION: CWS nativefixer10 (1.6.32); FILE MERGED
2005/06/13 13:43:56 obr 1.6.32.1: #123452# teach user install scripts to install patches as well
Diffstat (limited to 'setup_native/scripts')
-rw-r--r--setup_native/scripts/uninstall_solaris.sh7
1 files changed, 1 insertions, 6 deletions
diff --git a/setup_native/scripts/uninstall_solaris.sh b/setup_native/scripts/uninstall_solaris.sh
index ee2deb942a47..970191f08421 100644
--- a/setup_native/scripts/uninstall_solaris.sh
+++ b/setup_native/scripts/uninstall_solaris.sh
@@ -17,7 +17,6 @@ MY_ROOT=$1
cd `dirname $0`
DIRECTORY=`pwd`
-ADMINFILE=$DIRECTORY/admin
GETUID_SO=/tmp/getuid.so.$$
linenum=???
tail +$linenum `basename $0` > $GETUID_SO
@@ -42,12 +41,8 @@ INSTALL_DIR=$MY_ROOT`pkginfo -R $MY_ROOT -r $COREPKG01`
# 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 -n -a $ADMINFILE -R $MY_ROOT $i
+ LD_PRELOAD=$GETUID_SO /usr/sbin/pkgrm -n -R $MY_ROOT $i
done
# Removing old root directory, very dangerous!