diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-04-16 10:09:51 +0200 |
| commit | 4f2def4221587cb4b903eb383e80bfaf53614bd3 (patch) | |
| tree | eabda08ca405458cfe4cb5f84f859ed5524f9343 /setup_native/scripts | |
| parent | 1a6b9d602bd1e30ab299b3fc9bf6b217c8abe77c (diff) | |
| parent | 1e245ea8d0fc3972c747124205e09947aa237001 (diff) | |
CWS-TOOLING: integrate CWS sb118
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 77a7f18fbc7d..89588d0c4d03 100644 --- a/setup_native/scripts/admin.pl +++ b/setup_native/scripts/admin.pl @@ -190,13 +190,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; @@ -382,11 +380,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 { @@ -837,20 +832,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); } } |