diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 18:27:35 +0200 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2010-05-27 18:27:35 +0200 |
| commit | 5a797e371db41b31a3540e8a91e614e97c40aa10 (patch) | |
| tree | 86f24d4ad4887ae62120cf471ca9205ec9529e4e /solenv | |
| parent | 6d7096776af5f158cdc8f1ee0a1372ff746dcc94 (diff) | |
| parent | d9345b2386f3aaf8d7a12b51415392adebdf6fd1 (diff) | |
CWS-TOOLING: integrate CWS native304
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/environment.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/systemactions.pm | 7 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/worker.pm | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/solenv/bin/modules/installer/environment.pm b/solenv/bin/modules/installer/environment.pm index 2ee6fd41af47..b54912b72616 100644 --- a/solenv/bin/modules/installer/environment.pm +++ b/solenv/bin/modules/installer/environment.pm @@ -131,7 +131,9 @@ sub set_global_environment_variables if ( $ENV{'SOLAR_JAVA'} ) { $installer::globals::solarjavaset = 1; } if ( $ENV{'RPM'} ) { $installer::globals::rpm = $ENV{'RPM'}; } if ( $ENV{'DONTCOMPRESS'} ) { $installer::globals::solarisdontcompress = 1; } + if (( $ENV{'DISABLE_STRIP'} ) && ( $ENV{'DISABLE_STRIP'} ne '' )) { $installer::globals::strip = 0; } + 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/globals.pm b/solenv/bin/modules/installer/globals.pm index 564df06e79e2..5e26b604ad41 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -236,7 +236,7 @@ BEGIN $mergefiles_added_into_collector = 0; $creating_windows_installer_patch = 0; - $strip = $ENV{DISABLE_STRIP} eq ''; + $strip = 1; $solarjava = 0; $jdklib = ""; $jrepath = ""; 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"; |