Kaydet (Commit) 518f404d authored tarafından Michael Stahl's avatar Michael Stahl

installer: remove some special-casing of obsolete "common.pro" dirs

Change-Id: I8e79bb278759c3d6c5c782c6f2e0df8758e801c8
üst 19b2933c
...@@ -162,14 +162,8 @@ sub resolving_archive_flag ...@@ -162,14 +162,8 @@ sub resolving_archive_flag
if ( $styles =~ /\bARCHIVE\b/ ) # copying, unzipping and changing the file list if ( $styles =~ /\bARCHIVE\b/ ) # copying, unzipping and changing the file list
{ {
my $iscommonfile = 0;
my $sourcepath = $onefile->{'sourcepath'}; my $sourcepath = $onefile->{'sourcepath'};
if ( $sourcepath =~ /\Q$installer::globals::separator\E\bcommon\Q$installer::globals::separator\E/ ) # /common/ or /common.pro/
{
$iscommonfile = 1;
}
my $use_internal_rights = 0; my $use_internal_rights = 0;
if ( $styles =~ /\bUSE_INTERNAL_RIGHTS\b/ ) { $use_internal_rights = 1; } # using the rights used inside the zip file if ( $styles =~ /\bUSE_INTERNAL_RIGHTS\b/ ) { $use_internal_rights = 1; } # using the rights used inside the zip file
......
...@@ -202,11 +202,6 @@ sub create_directories ...@@ -202,11 +202,6 @@ sub create_directories
if ($newdirectory eq "unzip" ) # special handling for common directory if ($newdirectory eq "unzip" ) # special handling for common directory
{ {
$path = $path . ".." . $installer::globals::separator . "common" . $installer::globals::separator;
create_directory($path);
$path = $path . $newdirectory . $installer::globals::separator;
create_directory($path);
} }
else else
{ {
......
...@@ -75,11 +75,6 @@ sub create_directories ...@@ -75,11 +75,6 @@ sub create_directories
if ($directory eq "unzip" ) if ($directory eq "unzip" )
{ {
$path = $path . "common" . $par2script::globals::separator;
create_directory($path);
$path = $path . $directory . $par2script::globals::separator;
create_directory($path);
} }
else else
{ {
......
...@@ -98,11 +98,6 @@ sub create_directories ...@@ -98,11 +98,6 @@ sub create_directories
if ($directory eq "unzip" ) if ($directory eq "unzip" )
{ {
$path = $path . "common" . $pre2par::globals::separator;
create_directory($path);
$path = $path . $directory . $pre2par::globals::separator;
create_directory($path);
} }
else else
{ {
......
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