diff options
| -rw-r--r-- | perl-install/install2.pm | 1 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 190b529ab..b8ddbb3d3 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -537,6 +537,7 @@ sub main { add2hash($o->{netc}, network::read_resolv_conf($file)); } } + install_any::remove_unused(); #-the main cycle my $clicked = 0; diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 2e923ec52..74d629553 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -1023,16 +1023,21 @@ sub check_prog { chmod 0755, $f_; } -sub remove_bigseldom_used { - log::l("remove_bigseldom_used"); +sub remove_unused { $::testing and return; - unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(DarkMarble marble3d); if ($::o->isa('interactive_gtk')) { unlink glob_("/lib/lib$_*") foreach qw(slang newt); unlink "/usr/bin/perl-install/auto/Newt/Newt.so"; } else { unlink glob_("/usr/X11R6/bin/XF*"); } +} + +sub remove_bigseldom_used { + log::l("remove_bigseldom_used"); + $::testing and return; + remove_unused(); + unlink glob_("/usr/share/gtk/themes/$_*") foreach qw(DarkMarble marble3d); unlink(m|^/| ? $_ : "/usr/bin/$_") foreach ((map { @$_ } @bigseldom_used_groups), qw(mkreiserfs resize_reiserfs), |