strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS c05v005_SRC680 (1.22.104); FILE MERGED

Browse source 
2007/09/12 15:30:23 obr 1.22.104.1: #150542# modify both productkey variables for special flags
This commit is contained in:
Ivo Hinkelmann 2007-10-15 16:37:39 +00:00
parent 7fe73af7c0
commit f04355bda4
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
solenv/bin/modules/installer/windows/directory.pm
View file

@ -4,9 +4,9 @@
#
# $RCSfile: directory.pm,v $
#
# $Revision: 1.23 $
# $Revision: 1.24 $
#
# last change: $Author: ihi $ $Date: 2007-08-20 15:27:37 $
# last change: $Author: ihi $ $Date: 2007-10-15 17:37:39 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -220,9 +220,21 @@ sub add_root_directories
my $realproductkey = $productname . " " . $productversion;
my $productkey = $productname . " " . $baseproductversion;
if (( $allvariableshashref->{'POSTVERSIONEXTENSION'} ) && ( ! $allvariableshashref->{'DONTUSEEXTENSIONINDEFAULTDIR'} )) { $productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'}; }
if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} ) { $productkey = $productname; }
if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} ) { $productkey =~ s/\ /\_/g; }
if (( $allvariableshashref->{'POSTVERSIONEXTENSION'} ) && ( ! $allvariableshashref->{'DONTUSEEXTENSIONINDEFAULTDIR'} ))
{
$productkey = $productkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'};
$realproductkey = $realproductkey . " " . $allvariableshashref->{'POSTVERSIONEXTENSION'};
}
if ( $allvariableshashref->{'NOVERSIONINDIRNAME'} )
{
$productkey = $productname;
$realproductkey = $realproductname;
}
if ( $allvariableshashref->{'NOSPACEINDIRECTORYNAME'} )
{
$productkey =~ s/\ /\_/g;
$realproductkey =~ s/\ /\_/g;
}
my $shortproductkey = installer::windows::idtglobal::make_eight_three_conform($productkey, "dir"); # third parameter not used
$shortproductkey =~ s/\s/\_/g; # changing empty space to underline