summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-03-11 17:09:26 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-03-11 17:09:26 +0000
commitc05d74afa4345ce2681b4e1a628c73990333280e (patch)
tree8f05346861063b5ad442c300271abb16d4869cca
parent7b98509748ea4b62a913a550534a485049348982 (diff)
downloaddrakx-c05d74afa4345ce2681b4e1a628c73990333280e.tar
drakx-c05d74afa4345ce2681b4e1a628c73990333280e.tar.gz
drakx-c05d74afa4345ce2681b4e1a628c73990333280e.tar.bz2
drakx-c05d74afa4345ce2681b4e1a628c73990333280e.tar.xz
drakx-c05d74afa4345ce2681b4e1a628c73990333280e.zip
- install xawtv when necessary instead of
telling people to use urpmi (titi sucks) - prints out a message when no tv card has been detected
-rwxr-xr-xperl-install/standalone/drakxtv28
1 files changed, 19 insertions, 9 deletions
diff --git a/perl-install/standalone/drakxtv b/perl-install/standalone/drakxtv
index 2d5124685..5cd2bfcab 100755
--- a/perl-install/standalone/drakxtv
+++ b/perl-install/standalone/drakxtv
@@ -25,19 +25,19 @@
#package tvdrake;
use lib qw(/usr/lib/libDrakX);
+
+use standalone; #- warning, standalone must be loaded very first, for 'explanations'
+
use interactive;
use strict;
use detect_devices;
+use common;
+
+my $in = 'interactive'->vnew('su', 'default');
sub scan4channels {
- my $in = shift;
my $wait;
- if ( ! -f "/usr/bin/scantv" ) {
- $wait = $in->ask_warn(_('Error'),
- _("XawTV isn't installed ...\nYou should install it.\n Just type \"urpmi xawtv\""));
- $in->exit(0);
- return;
- }
+ -x "/usr/bin/scantv" or $in->do_pkgs->install('xawtv');
my ($i, $ftable_id, $norm, $check);
@@ -76,9 +76,19 @@ sub scan4channels {
}
-scan4channels('interactive'->vnew())
- if grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' } detect_devices::probeall(1);
+if (grep { $_->{media_type} eq 'MULTIMEDIA_VIDEO' } detect_devices::probeall(1)) {
+ scan4channels();
+} else {
+ $in->ask_warn(_("No TV Card detected!"), formatAlaTeX(
+_("No TV Card has been detected on your machine. Please verify that a Linux-supported Video/TV Card is correctly plugged in.
+
+You can visit our hardware database at:
+
+
+http://www.linux-mandrake.com/en/hardware.php3")));
+}
+
# TODO :
# - offer to sort channels after