diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-09-01 11:13:53 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-09-01 19:43:04 +0100 |
| commit | 212847783dfc7b3c0a81c86f3f89247c98bb94ae (patch) | |
| tree | e3223198ca62ac4aed157055c38ae29a6ed14e0b /solenv | |
| parent | a3f8156e0dfeff671a6e200075e727b1f037382c (diff) | |
installer: Inline $installer::globals::globaltempdirname
Change-Id: I4174f61e45e71720d0679f798f440096d0ce4583
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 1 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/parameter.pm | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index fd825c18668d..49f380cb8fea 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -93,7 +93,6 @@ BEGIN $msilanguage = ""; # hash reference for msi languages LCID $sofficeiconadded = 0; $temppath = ""; - $globaltempdirname = "ooopackaging"; $cyg_temppath = ""; $temppathdefined = 0; $packageversion = 1; diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm index 07d7fe4ab3ea..609f7b41d819 100644 --- a/solenv/bin/modules/installer/parameter.pm +++ b/solenv/bin/modules/installer/parameter.pm @@ -376,7 +376,7 @@ sub setglobalvariables elsif ( $ENV{'TEMP'} ) { $installer::globals::temppath = $ENV{'TEMP'}; } elsif ( $ENV{'TMPDIR'} ) { $installer::globals::temppath = $ENV{'TMPDIR'}; } $installer::globals::temppath =~ s/\Q$installer::globals::separator\E\s*$//; # removing ending slashes and backslashes - $installer::globals::temppath = $installer::globals::temppath . $installer::globals::separator . $installer::globals::globaltempdirname; + $installer::globals::temppath .= $installer::globals::separator . 'ooopackaging'; installer::systemactions::create_directory_with_privileges($installer::globals::temppath, "777"); my $dirsave = $installer::globals::temppath; |