diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:17:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-24 15:17:17 +0000 |
| commit | 5beb48e7427ec0a3a681fcff591060ab0cf1981f (patch) | |
| tree | 76f7bd0e4f65b6227a65437c2418e7ab099c41af /setup_native/scripts | |
| parent | 50a89dacab88819ee9738fdd00d18f495f9214c3 (diff) | |
INTEGRATION: CWS nativefixer4 (1.7.2); FILE MERGED
2005/02/14 16:26:22 is 1.7.2.1: #i42530# new core dependencies
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/install_solaris.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/setup_native/scripts/install_solaris.sh b/setup_native/scripts/install_solaris.sh index e54e650bfb40..b52c0005b6be 100644 --- a/setup_native/scripts/install_solaris.sh +++ b/setup_native/scripts/install_solaris.sh @@ -84,10 +84,11 @@ fi # Check and get the list of packages to install # -COREPKG=`find $PACKAGE_PATH/* -type d -prune -name "*-core01*" -print` -PKGLIST=`find $PACKAGE_PATH/* -type d -prune ! -name "*adabas*" ! -name "*j5*" ! -name "*-desktop-int*" ! -name "*-cde*" ! -name "*-core01*" ! -name "*-gnome*" -print` +COREPKG01=`find $PACKAGE_PATH/* -type d -prune -name "*-core01*" -print` +COREPKGLIST=`find $PACKAGE_PATH/* -type d -prune -name "*-core*" -print` +PKGLIST=`find $PACKAGE_PATH/* -type d -prune ! -name "*adabas*" ! -name "*j5*" ! -name "*-desktop-int*" ! -name "*-cde*" ! -name "*-core*" ! -name "*-gnome*" -print` -if [ -z "$COREPKG" ] +if [ -z "$COREPKG01" ] then error "No core package found in directory $PACKAGE_PATH" fi @@ -100,7 +101,7 @@ then fi echo "Packages found:" -for i in $COREPKG $PKGLIST $GNOMEPKG; do +for i in $COREPKGLIST $PKGLIST $GNOMEPKG; do echo `basename $i` done @@ -108,7 +109,7 @@ done # Check/Create installation directory # -CORENAME=`basename $COREPKG` +CORENAME=`basename $COREPKG01` INSTALLDIR=$MY_ROOT`pkgparam -d $PACKAGE_PATH $CORENAME BASEDIR` # We expect that $INSTALLDIR does not exist, however if it is empty we ignore it @@ -159,7 +160,7 @@ echo "Path to the installation : " $MY_ROOT export LD_PRELOAD=$GETUID_SO -for i in $COREPKG $PKGLIST $GNOMEPKG; do +for i in $COREPKGLIST $PKGLIST $GNOMEPKG; do echo /usr/sbin/pkgadd -a $ADMINFILE -d $PACKAGE_PATH -R $MY_ROOT `basename $i` /usr/sbin/pkgadd -a $ADMINFILE -d $PACKAGE_PATH -R $MY_ROOT `basename $i` done |