Kaydet (Commit) 3ce06f2d authored tarafından Tim Retout's avatar Tim Retout

installer: Inline @installer::globals::environmentvariables

Change-Id: I9aab3ec39b833dac242b9ede21ac3f2e5eb78200
üst 41086934
...@@ -271,16 +271,22 @@ sub check_makecab_version ...@@ -271,16 +271,22 @@ sub check_makecab_version
sub check_system_environment sub check_system_environment
{ {
my %variables = (); my %variables = ();
my $key;
my $error = 0; my $error = 0;
foreach $key ( @installer::globals::environmentvariables ) my @environmentvariables = qw(
SOLARVERSION
GUI
WORK_STAMP
OUTPATH
LOCAL_OUT
LOCAL_COMMON_OUT
);
for my $key ( @environmentvariables )
{ {
my $value = ""; $variables{$key} = $ENV{$key} || "";
if ( $ENV{$key} ) { $value = $ENV{$key}; }
$variables{$key} = $value;
if ( $value eq "" ) if ( $variables{$key} eq "" )
{ {
installer::logger::print_error( "$key not set in environment\n" ); installer::logger::print_error( "$key not set in environment\n" );
$error = 1; $error = 1;
......
...@@ -263,7 +263,6 @@ BEGIN ...@@ -263,7 +263,6 @@ BEGIN
@solarispatchscripts = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall", "postinstall", "preinstall", "i.none"); @solarispatchscripts = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall", "postinstall", "preinstall", "i.none");
@solarispatchscriptsforextensions = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall_extensions", "postinstall_extensions", "preinstall", "i.none"); @solarispatchscriptsforextensions = ("checkinstall", "copyright", "patch_checkinstall", "patch_postinstall_extensions", "postinstall_extensions", "preinstall", "i.none");
@solarispatchfiles = (".diPatch", "patchinfo"); @solarispatchfiles = (".diPatch", "patchinfo");
@environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
@packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" ); @packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
@languagepackfeature =(); @languagepackfeature =();
@helppackfeature =(); @helppackfeature =();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment