diff options
| author | Tim Retout <tim@retout.co.uk> | 2012-09-01 11:26:35 +0100 |
|---|---|---|
| committer | Tim Retout <tim@retout.co.uk> | 2012-09-01 19:43:06 +0100 |
| commit | bd52c601fbc3b68b17ececfe62df15630a90ddbe (patch) | |
| tree | 51450d0c0723c0fc7cb1c53fee47e6ce2358c307 | |
| parent | e0aa5e6f3a6d6702a2c6b8cd1d807bfc4a48d8df (diff) | |
installer: Replace $installer::globals::plat
Change-Id: I81076008a619063acadc328a4ae8caf27eb8fe50
| -rw-r--r-- | solenv/bin/modules/installer/globals.pm | 4 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/profiles.pm | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index 2c63ab41f0f0..1cd549e2da31 100644 --- a/solenv/bin/modules/installer/globals.pm +++ b/solenv/bin/modules/installer/globals.pm @@ -292,9 +292,7 @@ BEGIN @removedirs = (); @removefiletable = (); - $plat = $^O; - - if ( $plat =~ /cygwin/i ) + if ( $^O =~ /cygwin/i ) { $zippath = "zip"; # Has to be in the path: /usr/bin/zip $separator = "/"; diff --git a/solenv/bin/modules/installer/profiles.pm b/solenv/bin/modules/installer/profiles.pm index fba586b56526..ef0ce7d50b3e 100644 --- a/solenv/bin/modules/installer/profiles.pm +++ b/solenv/bin/modules/installer/profiles.pm @@ -207,7 +207,7 @@ sub create_profiles # Sorting the array @onefile my $onefileref = sorting_profile(\@onefile); - if ( $installer::globals::iswin && $installer::globals::plat =~ /cygwin/i) # Windows line ends only for Cygwin + if ( $installer::globals::iswin && $^O =~ /cygwin/i) # Windows line ends only for Cygwin { include_windows_lineends($onefileref); } |