diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-10 17:51:25 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-10 17:51:25 +0000 |
| commit | 1dc38b782e57bcba3e00e94613c05e8aea418945 (patch) | |
| tree | cb45e5b99433a068fb2fec60a1e06e6a0b082d5b /solenv | |
| parent | 33827674420dcc389c8e08ee529efcb6e8a7a093 (diff) | |
INTEGRATION: CWS vq33 (1.32.110); FILE MERGED
2006/07/03 18:44:53 vq 1.32.110.1: #i66940# Make the scripts aware of bash as possible shell.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msiglobal.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm b/solenv/bin/modules/installer/windows/msiglobal.pm index 0f482139a47c..bb330b81d252 100644 --- a/solenv/bin/modules/installer/windows/msiglobal.pm +++ b/solenv/bin/modules/installer/windows/msiglobal.pm @@ -4,9 +4,9 @@ # # $RCSfile: msiglobal.pm,v $ # -# $Revision: 1.32 $ +# $Revision: 1.33 $ # -# last change: $Author: rt $ $Date: 2006-03-06 14:01:56 $ +# last change: $Author: obo $ $Date: 2006-07-10 18:51:25 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -1278,7 +1278,7 @@ sub include_cabs_into_msi $msifilename = installer::converter::make_path_conform($msifilename); - if ( $ENV{'USE_SHELL'} eq "tcsh" ) { + if ( $ENV{'USE_SHELL'} ne "4nt" ) { # msidb.exe really wants backslashes. (And double escaping because system() expands the string.) $idtdirbase =~ s/\//\\\\/g; $msifilename =~ s/\//\\\\/g; |