From 3fd024ac7fcc4595f4cd641374bf36dde383d51a Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sat, 6 Mar 2021 14:10:00 +0300 Subject: [PATCH] All symlinked themes must not be listed to prevent confusing dupes 2/2 --- cluster-usermin/cluster-usermin-lib.pl | 2 +- cluster-webmin/cluster-webmin-lib.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster-usermin/cluster-usermin-lib.pl b/cluster-usermin/cluster-usermin-lib.pl index 0b49af504..2edd44258 100755 --- a/cluster-usermin/cluster-usermin-lib.pl +++ b/cluster-usermin/cluster-usermin-lib.pl @@ -113,7 +113,7 @@ sub all_themes { local %done; return sort { $a->{'desc'} cmp $b->{'desc'} } - grep { !$done{$_->{'dir'}}++ } + grep { ! -l "$root_directory/$_->{'dir'}" && !$done{$_->{'dir'}}++ } map { @{$_->{'themes'}} } @{$_[0]}; } diff --git a/cluster-webmin/cluster-webmin-lib.pl b/cluster-webmin/cluster-webmin-lib.pl index 07c4323e7..a3ff42084 100755 --- a/cluster-webmin/cluster-webmin-lib.pl +++ b/cluster-webmin/cluster-webmin-lib.pl @@ -147,7 +147,7 @@ sub all_themes { local %done; return sort { $a->{'desc'} cmp $b->{'desc'} } - grep { !$done{$_->{'dir'}}++ } + grep { ! -l "$root_directory/$_->{'dir'}" && !$done{$_->{'dir'}}++ } map { @{$_->{'themes'}} } @{$_[0]}; }