merge remove-unused-hardware-packages and remove-unselected-locales

helpers into a new remove-unused-packages tool (and make it reusable)

3 files changed, 11 insertions, 56 deletions

diff --git a/perl-install/standalone/remove-unselected-locales b/perl-install/standalone/remove-unselected-locales
deleted file mode 100644
index 8e4eabccc..000000000
--- a/perl-install/standalone/remove-unselected-locales
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use common;
-use lang;
-use interactive;
-use do_pkgs;
-use run_program;
-use standalone;
-
-my $in = interactive->vnew;
-my $wait = $in->wait_message(N("Localization packages removal"),
-			     N("Finding unused localization packages..."));
-my $do_pkgs = do_pkgs->do_pkgs($in);
-my @unselected_locales = pkgs::detect_unselected_locale_packages($do_pkgs);
-undef $wait;
-
-#- we should have some gurpme
-if (@unselected_locales &&
-    $in->ask_yesorno(
-	N("Localization packages removal"),
-	N("The following localization packages do not seem to be useful for your system:") . "\n" .
-	join("\n", map { "  " . $_ } sort(@unselected_locales)) . "\n" .
-	N("Do you want to remove these packages?"))) {
-    my $_wait = $in->wait_message(N("Please wait"), N("Removing packages..."));
-    run_program::run('urpme', '--auto', @unselected_locales);
-}
-
-# use script from One to list language files (/usr/share/locale mainly) and remove them?
diff --git a/perl-install/standalone/remove-unused-hardware-packages b/perl-install/standalone/remove-unused-hardware-packages
deleted file mode 100644
index eb7a126dc..000000000
--- a/perl-install/standalone/remove-unused-hardware-packages
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/perl
-
-use lib qw(/usr/lib/libDrakX);
-use common;
-use pkgs;
-use interactive;
-use do_pkgs;
-use run_program;
-use standalone;
-
-my $in = interactive->vnew;
-my $wait = $in->wait_message(N("Hardware packages removal"),
-			     N("Finding unused hardware packages..."));
-my $do_pkgs = do_pkgs->do_pkgs($in);
-my @unused_hardware_packages = pkgs::detect_unused_hardware_packages($do_pkgs);
-undef $wait;
-
-#- we should have some gurpme
-if (@unused_hardware_packages &&
-    $in->ask_yesorno(
-	N("Hardware packages removal"),
-	N("The following hardware packages do not seem to be useful for your system:") . "\n" .
-	join("\n", map { "  " . $_ } sort(@unused_hardware_packages)) . "\n" .
-	N("Do you want to remove these packages?"))) {
-    my $_wait = $in->wait_message(N("Please wait"), N("Removing packages..."));
-    run_program::run('urpme', '--auto', @unused_hardware_packages);
-}
diff --git a/perl-install/standalone/remove-unused-packages b/perl-install/standalone/remove-unused-packages
new file mode 100755
index 000000000..5d3989414
--- /dev/null
+++ b/perl-install/standalone/remove-unused-packages
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+use lib qw(/usr/lib/libDrakX);
+use pkgs;
+use interactive;
+use do_pkgs;
+use standalone;
+
+my $in = interactive->vnew('su');
+my $do_pkgs = do_pkgs->do_pkgs($in);
+pkgs::remove_unused_packages($in, $do_pkgs);