diff options
Diffstat (limited to 'perl-install/standalone/XFdrake')
| -rwxr-xr-x | perl-install/standalone/XFdrake | 31 |
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 |