diff options
| author | sb <sb@openoffice.org> | 2010-01-12 18:49:59 +0100 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-01-12 18:49:59 +0100 |
| commit | 55ec111502477e7527498888e795dfdf006c5eb5 (patch) | |
| tree | 1c3cd9e0e4f7ad93bd741c5d39b492aabe39f7d7 /setup_native/scripts | |
| parent | 180c780b16b164c23afe2ae8f0e03f89bc4f9a3a (diff) | |
sb118: #i108269# first step of removing tcsh support
Diffstat (limited to 'setup_native/scripts')
| -rw-r--r-- | setup_native/scripts/admin.pl | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/setup_native/scripts/admin.pl b/setup_native/scripts/admin.pl index f737a6392f13..bb2f8b3a7d91 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -194,13 +194,11 @@ sub convert_stringlist_into_array { $first = $1; $last = $2; - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $first =~ s/\//\\/g; } # Problem with two directly following listseparators. For example a path with two ";;" directly behind each other $first =~ s/^$listseparator//; push(@newarray, "$first\n"); } - if ( defined($ENV{'USE_SHELL'}) && $ENV{'USE_SHELL'} eq "4nt" ) { $last =~ s/\//\\/g; } push(@newarray, "$last\n"); return \@newarray; @@ -386,11 +384,8 @@ sub try_to_create_directory { $created_directory = 1; - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod 775 $directory \>\/dev\/null 2\>\&1"; + system($localcall); } else { @@ -841,20 +836,14 @@ sub create_directory_with_privileges if ($returnvalue) { - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; + system($localcall); } } else { - if ( defined $ENV{'USE_SHELL'} && $ENV{'USE_SHELL'} ne "4nt" ) - { - my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; - system($localcall); - } + my $localcall = "chmod $privileges $directory \>\/dev\/null 2\>\&1"; + system($localcall); } } |