From bd52c601fbc3b68b17ececfe62df15630a90ddbe Mon Sep 17 00:00:00 2001
From: Tim Retout <tim@retout.co.uk>
Date: Sat, 1 Sep 2012 11:26:35 +0100
Subject: installer: Replace $installer::globals::plat

Change-Id: I81076008a619063acadc328a4ae8caf27eb8fe50
---
 solenv/bin/modules/installer/globals.pm  | 4 +---
 solenv/bin/modules/installer/profiles.pm | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'solenv/bin')

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);
         }
-- 
cgit