diff options
| author | Ingo Schmidt <is@openoffice.org> | 2009-10-29 11:33:58 +0000 |
|---|---|---|
| committer | Ingo Schmidt <is@openoffice.org> | 2009-10-29 11:33:58 +0000 |
| commit | 34cf5372d0d7cc12345db498559359a30acf3e78 (patch) | |
| tree | faef999f79fb021722dfcf1a7b72d040b89396d0 /setup_native | |
| parent | faf0b92ddb466599ccef0817b352c5e46bd5464c (diff) | |
#i10633# admin.pl support for msidb.exe next to admin.pl
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/admin.pl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index ec8890a51f24..ebb16d0ef008 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -160,7 +160,9 @@ sub check_local_msidb my $msidbname = "msidb.exe"; my $perlprogramm = $0; my $path = $perlprogramm; + get_path_from_fullqualifiedname(\$path); + $path =~ s/\\\s*$//; $path =~ s/\/\s*$//; @@ -413,7 +415,7 @@ sub get_path_from_fullqualifiedname if ( $$longfilenameref =~ /\Q$separator\E/ ) # Is there a separator in the path? Otherwise the path is empty. { - if ( $$longfilenameref =~ /^\s*(\S.*\S\Q$separator\E)(\S.+\S?)/ ) + if ( $$longfilenameref =~ /^\s*(\S.*\Q$separator\E)(\S.+\S?)/ ) { $$longfilenameref = $1; } |