diff options
| author | Ingo Schmidt <is@openoffice.org> | 2010-05-21 14:14:48 +0200 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2010-05-21 14:14:48 +0200 |
| commit | 93638dfae86168e1f16f417349a140e496979cda (patch) | |
| tree | bb63031740e80522536c724c92eedb10ffe36df5 /solenv | |
| parent | 7a0b82b2e808926d776341670a97eecfa6c2c1f4 (diff) | |
#i111450# localinstalldir with full installation set tree
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 7 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 2ee6fd41af47..e21c97b1d7ce 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -132,6 +132,7 @@ sub set_global_environment_variables if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; } if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; } + if ( $installer::globals::localinstalldir ) { $installer::globals::localinstalldirset = 1; } # Special handling, if LOCALINSTALLDIR contains "~" in the path if ( $installer::globals::localinstalldir =~ /^\s*\~/ ) { check_tilde_in_directory(); } } diff --git a/solenv/bin/modules/installer/systemactions.pm b/solenv/bin/modules/installer/systemactions.pm index bbc65d3c1f7a..df3b331b80d8 100644 --- a/solenv/bin/modules/installer/systemactions.pm +++ b/solenv/bin/modules/installer/systemactions.pm @@ -321,6 +321,13 @@ sub create_directories else { $path = $installer::globals::unpackpath . $installer::globals::separator; + + # special handling, if LOCALINSTALLDIR is set + if (( $installer::globals::localinstalldirset ) && ( $newdirectory eq "install" )) + { + $installer::globals::localinstalldir =~ s/\Q$installer::globals::separator\E\s*$//; + $path = $installer::globals::localinstalldir . $installer::globals::separator; + } } $infoline = "create_directories: Using $path for $newdirectory !\n"; diff --git a/solenv/bin/modules/installer/worker.pm b/solenv/bin/modules/installer/worker.pm index 6cc3c1e3f5db..e8a8f922bc41 100644 --- a/solenv/bin/modules/installer/worker.pm +++ b/solenv/bin/modules/installer/worker.pm @@ -402,11 +402,6 @@ sub create_installation_directory else { $installdir = installer::systemactions::create_directories("install", $languageref); - if ( $installer::globals::localinstalldir ) - { - $installdir = $installer::globals::localinstalldir; - $installer::globals::localinstalldirset = 1; - } installer::logger::print_message( "... creating installation set in $installdir ...\n" ); remove_old_installation_sets($installdir); my $inprogressinstalldir = $installdir . "_inprogress"; |