michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1548 from webmin/copy-source-dir-symlink

Browse Source 
Fix to copy links first, no matter if dir or file
This commit is contained in:
Jamie Cameron
2021-11-21 11:52:15 -08:00
committed by GitHub
parent 458725a737 cf0cf19812
commit 55d286ee4c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web-lib-funcs.pl
View File

@@ -7078,6 +7078,12 @@ if ($gconfig{'os_type'} eq 'windows') {
$err = $out;
}
}
elsif (-l $src && !$copylink) {
# A link .. re-create
my $linkdst = readlink($src);
$ok = &symlink_logged($linkdst, $dst);
$err = $ok ? undef : $!;
}
elsif (-d $src) {
# A directory .. need to copy with tar command
my @st = stat($src);
@@ -7090,12 +7096,6 @@ elsif (-d $src) {
$err = $out;
}
}
elsif (-l $src && !$copylink) {
# A link .. re-create
my $linkdst = readlink($src);
$ok = &symlink_logged($linkdst, $dst);
$err = $ok ? undef : $!;
}
else {
# Can just copy with cp
my $out = &backquote_logged("cp -p ".quotemeta($src).