summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone/XFdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-22 01:56:47 +0000
commit3fbb4389df3ddeecd4fcd645591a3d90a47de373 (patch)
tree8f1547576b7dcbb2678e5aac7516d3e22e5169ec /perl-install/standalone/XFdrake
parentc942786c119d41faaa03357ddeb5bea338867727 (diff)
downloaddrakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.gz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.bz2
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.tar.xz
drakx-3fbb4389df3ddeecd4fcd645591a3d90a47de373.zip
no_comment
Diffstat (limited to 'perl-install/standalone/XFdrake')
-rwxr-xr-xperl-install/standalone/XFdrake31
1 files changed, 7 insertions, 24 deletions
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index 46c5b6f63..28864acc1 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -17,9 +17,9 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-use lib qw(/usr/lib/libDrakX .);
+use lib qw(/usr/lib/libDrakX);
-use common qw(:file);
+use interactive;
use Xconfigurator;
use Xconfig;
@@ -35,25 +35,8 @@ $::skiptest = /--skiptest/;
$::testing = /--testing/;
$::isStandalone = 1;
-my $hasX = do { `xtest`; $? == 0 };
-
-my $in; if ($hasX) {
- require 'interactive_gtk.pm';
- $in = interactive_gtk->new;
-} else {
- *log::l = undef;
- *log::l = sub {};
- require 'interactive_newt.pm';
- $in = interactive_newt->new;
-}
-
-Xconfigurator::main('', Xconfig::getinfo(), $in,
-# sub {
-# use install_any;
-# print "Here\n";
-# my ($X) = glob_("/mnt/disk/XFree86-$_[0]-*") or die "$_[0]'s X server rpm not found";
-# pkgs::install('', [ { name => $_[0], file => $X } ], 1, 0);
-# }
-);
-
-exec 'true' if $hasX; #- workaround for perl-GTK
+my $in = vnew interactive;
+
+Xconfigurator::main('', Xconfig::getinfo(), $in, 0, sub { `urpmi --auto XFree86-$_[0]` });
+
+exec 'true' if ref($in) =~ /gtk/; #- workaround for perl-GTK