diff options
25 files changed, 224 insertions, 190 deletions
@@ -1,17 +1,29 @@ -DrakConf +draksec is still buggy, don't try security >= 4 -bug in users: mandrake user is added twice in strange installs +BUG bootp in network install sigsegv -rpmdrake proposition for cdrom labels +missing alias ll for root -standalone applications for configuration (netdrake, authentificationconf, soundcard) +bug rpmdrake: just after installing a package, switch to `Installed', the package has wrong name + +bug in users: mandrake user is added twice in strange installs bug in diskdrake: in expert: blank, create hda5 at beginning, create hda6 at the end, create hda7 in the middle, remove the first one. Result hda5 at the end and bug. +urpmi.addmedia: |gzip instead of doing it afterwards +rpmdrake: Installed packages not in hdlist should be there +urpmi: pb if XXX-devel requires XXX = 1.2.3 and we updgrade XXX-1.2.3 + +standalone applications for configuration (netdrake, authentificationconf, soundcard) + -------------------------------------------------------------------------------- +rpmdrake proposition for cdrom labels + +detect ide burners and then add hdX=ide-scsi to kernel cmdline + bug in upgrade: install from hda1:/usr/local/blah with hda1:/ msec custom @@ -188,3 +200,5 @@ suggested partition tables must be better foreach installClass (done,pix)perl and .ph's +? in ftp install, locale not installed properly + diff --git a/perl-install/Makefile b/perl-install/Makefile index 600b3a438..67be5085a 100644 --- a/perl-install/Makefile +++ b/perl-install/Makefile @@ -16,7 +16,7 @@ tar-drakxtools: clean $(MAKE) -C ../tools clean cd .. ; rm -rf drakxtools ; cp -af perl-install drakxtools ; cp -af tools/ddcprobe tools/pnp_serial drakxtools cd ../drakxtools ; rm -rf install* ForMakefile.pm pkgs.pm ftp.pm t.pm standalone/CVS ; mv Makefile.drakxtools Makefile ; mv -f standalone/* . - cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config MonitorsDB Newt c ddcprobe pnp_serial po pci_probing resize_fat diskdrake.rc $(STANDALONEPMS) *.pm) + cd .. ; tar cfy drakxtools.tar.bz2 --exclude CVS $(patsubst %,drakxtools/%,Makefile Makefile.config MonitorsDB Newt c ddcprobe pnp_serial po pci_probing resize_fat diskdrake.rc $(STANDALONEPMS) icons *.pm) cd .. ; rm -rf drakxtools $(DIRS): @@ -27,6 +27,9 @@ test_pms: verify_c ./perl2fcalls -excludec -excluderesize_fat::c_rewritten install2 for i in install2 install_steps_*.pm; do perl -cw -I. $$i; done +test_all: test_pms + for i in $(PMS); do perl -cw -I. $$i; done + verify_c: ./verify_c $(PMS) diff --git a/perl-install/Makefile.drakxtools b/perl-install/Makefile.drakxtools index d3efebb31..0ab07ef91 100644 --- a/perl-install/Makefile.drakxtools +++ b/perl-install/Makefile.drakxtools @@ -32,6 +32,6 @@ install: install -m 644 $(patsubst %,c/%.pm,stuff) $(LIBDEST)/c install -m 644 $(patsubst %,pci_probing/%.pm,main pcitable pci_class) $(LIBDEST)/pci_probing install -m 644 $(patsubst %,resize_fat/%.pm,main any boot_sector c_rewritten dir_entry directory fat info_sector io) $(LIBDEST)/resize_fat - cp -rf auto $(LIBDEST) + cp -rf auto icons $(LIBDEST) bzip2 -9 $(LIBDEST)/po/*.po find $(LIBDEST) -name "*.so" | xargs strip diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index 533ee8847..b578faa67 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -776,7 +776,9 @@ sub main { !$@ || $@ =~ /ask_from_list cancel/ or die; $in->kill; } - + if (!$ok) { + $ok = !$in->ask_yesorno('', _("Forget the changes?"), 1); + } if ($ok) { unless ($::testing) { my $f = "$prefix/etc/X11/XF86Config"; diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm index 84ace7229..8ff939f5e 100644 --- a/perl-install/Xconfigurator_consts.pm +++ b/perl-install/Xconfigurator_consts.pm @@ -12,7 +12,7 @@ use common qw(:common); $resolution_wanted = "1024x768"; @resolutions = qw(640x480 800x600 1024x768 1152x864 1280x1024 1600x1200); -@window_managers = qw(icewm wmaker kwm afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce); +@window_managers = qw(icewm wmaker kwm afterstep fvwm fvwm2 fvwm95 mwm twm enlightenment xfce blackbox); %serversdriver = ( 'SVGA' => "svga", diff --git a/perl-install/common.pm b/perl-install/common.pm index 8830299be..e2b882b7c 100644 --- a/perl-install/common.pm +++ b/perl-install/common.pm @@ -218,7 +218,7 @@ sub glob_ { ($f = quotemeta $f) =~ s/\\\*/.*/g; $d =~ m|/$| or $d .= '/'; - map { $d eq './' ? $_ : "$d$_" } grep { /$f/ } all($d); + map { $d eq './' ? $_ : "$d$_" } grep { /^$f$/ } all($d); } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index f0eaae4bf..b637203f5 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -619,6 +619,8 @@ sub main { log::l("updating kde icons according to available devices"); install_any::kdeicons_postinstall($o->{prefix}); + run_program::rooted($o->{prefix}, "kdeDesktopCleanup"); + install_any::lnx4win_postinstall($o->{prefix}) if $o->{lnx4win}; install_any::killCardServices(); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index cd54b43d8..c2885cf26 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -482,7 +482,7 @@ sub install_urpmi { (my $name = _("installation")) =~ s/\s/_/g; #- in case translators are too good :-/ - my $f = "$prefix/etc/urpmi/hdlist.$name"; + my $f = "$prefix/var/lib/urpmi/hdlist.$name"; { my $fd = getFile("hdlist") or return; local *OUT; @@ -492,11 +492,11 @@ sub install_urpmi { } { local *F = getFile("depslist"); - output("$prefix/etc/urpmi/depslist", <F>); + output("$prefix/var/lib/urpmi/depslist", <F>); } { local *LIST; - open LIST, ">$prefix/etc/urpmi/list.$name" or log::l("failed to write list.$name"), return; + open LIST, ">$prefix/var/lib/urpmi/list.$name" or log::l("failed to write list.$name"), return; my $dir = ${{ nfs => "file://mnt/nfs", hd => "file:/" . hdInstallPath, diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index ffdd0ceee..d401d58a0 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -491,7 +491,7 @@ sub addUser($) { chmod $mode, "$p$u->{home}"; } } - commands::chown_("-r", "$u->{uid}.$u->{gid}", "$p$u->{home}") + eval { commands::chown_("-r", "$u->{uid}.$u->{gid}", "$p$u->{home}") } if $u->{uid} != $u->{oldu} || $u->{gid} != $u->{oldg}; my $msec = "$o->{prefix}/etc/security/msec"; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index f6032533d..f48221efa 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -13,7 +13,7 @@ use common qw(:common :file :functional :system); use partition_table qw(:types); use my_gtk qw(:helpers :wrappers); use Gtk; -use Gtk::XmHTML; +#use Gtk::XmHTML; use devices; use fsedit; use modules; @@ -300,12 +300,13 @@ When sure, press Ok."))) { #------------------------------------------------------------------------------ sub choosePackages { my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_; + my $size = install_any::getAvailableSpace($o) * 0.7; if ($::beginner) { require pkgs; - pkgs::setSelectedFromCompssList_($o->{compssListLevels}, $o->{packages}, install_any::getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{isUpgrade}); + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 1, $size, $o->{installClass}, $o->{isUpgrade}); } else { - pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 90, $o->{installClass}) unless $::expert || $o->{isUpgrade}; + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, $::expert ? 95 : 80, $size, $o->{installClass}) unless $::expert || $o->{isUpgrade}; install_steps_interactive::choosePackages(@_); chooseSizeToInstall(@_); choosePackagesTree(@_) if $::expert; @@ -316,7 +317,7 @@ sub chooseSizeToInstall { my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024)); my $current = pkgs::correctSize((sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024)); my $w = my_gtk->new(''); - my $adj = create_adjustment($current * 1.2, $current, $availableSpace); + my $adj = create_adjustment($current * 1.3, $current, $availableSpace); my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0); gtkadd($w->{window}, @@ -335,9 +336,9 @@ sub chooseSizeToInstall { $w->main or return; ($o->{packages_}{ind}, $o->{packages_}{select_level}) = - pkgs::setSelectedFromCompssList_($o->{compssListLevels}, $o->{packages}, - pkgs::invCorrectSize($spin->get_value_as_int) * sqr(1024), - $o->{installClass}, $o->{isUpgrade}); + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 0, + pkgs::invCorrectSize($spin->get_value_as_int) * sqr(1024), + $o->{installClass}, $o->{isUpgrade}); } sub choosePackagesTree { my ($o, $packages, $compss) = @_; @@ -556,7 +557,7 @@ sub installPackages { $nb = $_[0]; $total_size = $_[1]; $current_total_size = 0; $start_time = time(); - $msg->set(_("%d packages", $nb) . _(", %U MB", $total_size / 1024 / 1024)); + $msg->set(_("%d packages", $nb) . _(", %U MB", pkgs::correctSize($total_size / sqr(1024)))); $w->flush; } elsif ($m =~ /^Starting installing package/) { $progress->update(0); @@ -673,7 +674,7 @@ sub create_help_window { #- my @pixmap = Gtk::Gdk::Pixmap->create_from_xpm_d($w->{window}->window, undef, @l); #- gtkadd($b, new Gtk::Pixmap(@pixmap)); - Gtk::XmHTML->init; +# Gtk::XmHTML->init; gtkadd($w->{window}, gtkpack_(new Gtk::HBox(0,-2), #- 0, $b, diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 2999ba682..417f64e58 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -347,7 +347,6 @@ notation (for example, 1.2.3.4)."), focus_out => sub { $intf->{NETMASK} = network::netmask($intf->{IPADDR}) unless $_[0] } - ); } @@ -362,7 +361,7 @@ _("Please enter your host name. Your host name should be a fully-qualified host name, such as ``mybox.mylab.myco.com''. You may also enter the IP address of the gateway if you have one"), - [_("Host name:"), _("DNS server:"), _("Gateway:"), !$::beginner ? _("Gateway device:") : ()], + [_("Host name:"), _("DNS server:"), _("Gateway:"), $::expert ? _("Gateway device:") : ()], [(map { \$netc->{$_}} qw(HOSTNAME dnsServer GATEWAY)), {val => \$netc->{GATEWAYDEV}, list => \@devices}] ); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 1bcec9167..4b00800a7 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -284,21 +284,10 @@ sub readCompssUsers { #- $1 eq $lang || eval { lang::text2lang($1) eq $lang } && !$@; #- } -sub setSelectedFromCompssList($$$$$$) { - my ($compssListLevels, $packages, $level, $install_class) = @_; +sub setSelectedFromCompssList { + my ($compssListLevels, $packages, $min_level, $max_size, $install_class, $isUpgrade) = @_; my ($ind); - map_index { $ind = $::i if $_ eq $install_class } @$compssListLevels; - - foreach (allpackages($packages)) { - &select($packages, $_) if $_->{values}[$ind] >= $level; - } -} - -sub setSelectedFromCompssList_($$$$$$) { - my ($compssListLevels, $packages, $size, $install_class, $isUpgrade) = @_; - my ($level, $ind) = 100; - my @packages = allpackages($packages); my @places = do { map_index { $ind = $::i if $_ eq $install_class } @$compssListLevels; @@ -309,20 +298,20 @@ sub setSelectedFromCompssList_($$$$$$) { }; foreach (@places) { my $p = $packages[$_]; - $level = min($level, $p->{values}[$ind]); - last if $level == 0; + last if $p->{values}[$ind] < $min_level; &select($packages, $p) unless $isUpgrade; my $nb = 0; foreach (@packages) { $nb += $_->{size} if $_->{selected}; } - if ($nb > $size) { - unselect($packages, $p, $nb - $size) unless $isUpgrade; + if ($nb > $max_size) { + unselect($packages, $p, $nb - $max_size) unless $isUpgrade; + $min_level = $p->{values}[$ind]; last; } } - $ind, $level; + $ind, $min_level; } sub init_db { diff --git a/perl-install/share/compssList b/perl-install/share/compssList index dc3cd7c27..2793e9bad 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -82,8 +82,8 @@ dip 40 0 13 dosemu 45 0 49 dosemu-freedos 45 0 49 dosfstools 40 0 22 -DrakConf 84 0 84 -drakxtools 86 0 87 +DrakConf 84 84 84 +drakxtools 86 86 87 dump 10 0 87 e2fsprogs-devel 10 0 25 ed 45 0 5 @@ -386,56 +386,56 @@ linuxconf 90 79 86 linuxconf-devel 10 0 70 linux_logo 92 72 92 locales 96 76 96 -locales-ar 22 30 22 -locales-bg 22 30 22 -locales-br 22 30 22 -locales-ca 22 30 22 -locales-cs 22 30 22 -locales-cy 22 30 22 -locales-da 22 30 22 -locales-de 22 30 22 -locales-el 22 30 22 -locales-en 22 30 22 -locales-eo 22 30 22 -locales-es 22 30 22 -locales-et 22 30 22 -locales-eu 22 30 22 -locales-fi 22 30 22 -locales-fo 22 30 22 -locales-fr 22 30 22 -locales-ga 22 30 22 -locales-gl 22 30 22 -locales-he 22 30 22 -locales-hr 22 30 22 -locales-hu 22 30 22 -locales-hy 22 30 22 -locales-id 22 30 22 -locales-is 22 30 22 -locales-it 22 30 22 -locales-ja 22 30 22 -locales-ka 22 30 22 -locales-kl 22 30 22 -locales-ko 22 30 22 -locales-lo 22 30 22 -locales-lt 22 30 22 -locales-lv 22 30 22 -locales-nl 22 30 22 -locales-no 22 30 22 -locales-oc 22 30 22 -locales-pl 22 30 22 -locales-pt 22 30 22 -locales-ro 22 30 22 -locales-ru 22 30 22 -locales-sk 22 30 22 -locales-sl 22 30 22 -locales-sr 22 30 22 -locales-sv 22 30 22 -locales-th 22 30 22 -locales-tr 22 30 22 -locales-uk 22 30 22 -locales-vi 22 30 22 -locales-wa 22 30 22 -locales-zh 22 30 22 +locales-ar 26 30 26 +locales-bg 26 30 26 +locales-br 26 30 26 +locales-ca 26 30 26 +locales-cs 26 30 26 +locales-cy 26 30 26 +locales-da 26 30 26 +locales-de 26 30 26 +locales-el 26 30 26 +locales-en 26 30 26 +locales-eo 26 30 26 +locales-es 26 30 26 +locales-et 26 30 26 +locales-eu 26 30 26 +locales-fi 26 30 26 +locales-fo 26 30 26 +locales-fr 26 30 26 +locales-ga 26 30 26 +locales-gl 26 30 26 +locales-he 26 30 26 +locales-hr 26 30 26 +locales-hu 26 30 26 +locales-hy 26 30 26 +locales-id 26 30 26 +locales-is 26 30 26 +locales-it 26 30 26 +locales-ja 26 30 26 +locales-ka 26 30 26 +locales-kl 26 30 26 +locales-ko 26 30 26 +locales-lo 26 30 26 +locales-lt 26 30 26 +locales-lv 26 30 26 +locales-nl 26 30 26 +locales-no 26 30 26 +locales-oc 26 30 26 +locales-pl 26 30 26 +locales-pt 26 30 26 +locales-ro 26 30 26 +locales-ru 26 30 26 +locales-sk 26 30 26 +locales-sl 26 30 26 +locales-sr 26 30 26 +locales-sv 26 30 26 +locales-th 26 30 26 +locales-tr 26 30 26 +locales-uk 26 30 26 +locales-vi 26 30 26 +locales-wa 26 30 26 +locales-zh 26 30 26 lothar 83 0 83 lout 15 0 10 lout-doc 31 0 10 @@ -453,7 +453,7 @@ make 50 0 94 MAKEDEV 10 99 96 mandrake_desk 82 0 70 mandrake_doc 82 0 70 -MandrakeUpdate 82 0 70 +MandrakeUpdate 82 80 80 man-pages 90 0 72 man-pages-cs 20 0 20 man-pages-de 20 0 20 @@ -508,9 +508,8 @@ ncurses 0 0 80 ncurses-devel 10 0 80 netcfg 2 9 2 netkit-base 82 99 82 -netscape-common 0 0 0 -netscape-communicator 78 0 73 -netscape-francais 8 0 3 +netscape-communicator 78 60 73 +netscape-francais 7 0 2 netscape-navigator 50 0 54 newt 10 0 75 newt-devel 10 0 75 @@ -583,7 +582,7 @@ rhsound 40 0 36 rhs-printfilters 1 1 0 rmt 24 0 24 routed 0 90 19 -rpmdrake 84 30 81 +rpmdrake 84 80 81 rpm-devel 10 0 80 rsh 46 99 75 rsync 39 99 75 @@ -671,7 +670,7 @@ unarj 40 0 16 units 22 0 10 unzip 70 75 91 urlview 43 0 47 -urpmi 95 0 95 +urpmi 95 95 95 urw-fonts 50 0 34 usermode 51 0 58 usernet 42 0 37 @@ -780,7 +779,7 @@ xsoldier 51 0 45 xsysinfo 55 0 56 xtoolwait 50 0 35 xtrojka 51 0 45 -xv 53 0 47 +xv 33 0 27 xwpick 55 0 49 xxgdb 53 0 47 ypbind 0 35 0 diff --git a/perl-install/share/compssUsers b/perl-install/share/compssUsers index 3165682de..b2530b323 100644 --- a/perl-install/share/compssUsers +++ b/perl-install/share/compssUsers @@ -4,9 +4,14 @@ Graphics Manipulation KDE kde + XFree86 + XFree86-75dpi-fonts Gnome gnome + enlightenment + XFree86 + XFree86-75dpi-fonts Mail/WWW/News Tools network:web @@ -31,6 +36,8 @@ Multimedia Support Other window managers window-managers:window-managers + XFree86 + XFree86-75dpi-fonts Games games @@ -44,6 +51,7 @@ Web Server Network Management Workstation network:tools + daemons:network Documentation documentation:languages:en diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake index 99182ec85..b625647be 100755 --- a/perl-install/standalone/XFdrake +++ b/perl-install/standalone/XFdrake @@ -28,12 +28,12 @@ local $_ = join '', @ARGV; /-h/ and die "usage: XFdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n"; -$::beginner = /--beginner/; -$::expert = /--expert/; -$::auto = /--auto/; -$::noauto = /--noauto/; -$::skiptest = /--skiptest/; -$::testing = /--testing/; +$::beginner = /-beginner/; +$::expert = /-expert/; +$::auto = /-auto/; +$::noauto = /-noauto/; +$::skiptest = /-skiptest/; +$::testing = /-testing/; $::isStandalone = 1; system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing diff --git a/perl-install/standalone/adduserdrake b/perl-install/standalone/adduserdrake index 98c3ba3f9..490f09b7e 100755 --- a/perl-install/standalone/adduserdrake +++ b/perl-install/standalone/adduserdrake @@ -9,8 +9,8 @@ local $_ = join '', @ARGV; /-h/ and die "usage: adduserdrake [--beginner] [--expert]\n"; -$::beginner = /--beginner/; -$::expert = /--expert/; +$::beginner = /-beginner/; +$::expert = /-expert/; $::isStandalone = 1; my $in = vnew interactive('su'); diff --git a/perl-install/standalone/diskdrake b/perl-install/standalone/diskdrake index 036fa500a..f4f1e0d5c 100755 --- a/perl-install/standalone/diskdrake +++ b/perl-install/standalone/diskdrake @@ -36,8 +36,8 @@ local $_ = join '', @ARGV; /-h/ and die "usage: XFdrake [--expert] [--testing]\n"; -$::expert = /--expert/; -$::testing = /--testing/; +$::expert = /-expert/; +$::testing = /-testing/; $::isStandalone = 1; if ($>) { diff --git a/perl-install/standalone/draksec b/perl-install/standalone/draksec index 5fc4cce86..04d332541 100755 --- a/perl-install/standalone/draksec +++ b/perl-install/standalone/draksec @@ -11,7 +11,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: draksec [--expert]\n"; -$::expert = /--expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE="?expert/m; #" +$::expert = /-expert/ || cat_("/etc/sysconfig/system") =~ /^TYPE="?expert/m; #" $::isStandalone = 1; my $in = vnew interactive('su'); @@ -28,7 +28,9 @@ delete @l{0,1,5} unless $::expert; if (my $level = $in->ask_from_list('', _("Choose security level"), [ values %l ], $l{$ENV{SECURE_LEVEL}})) { my $w = $in->wait_message('', _("Setting security level")); + $in->suspend; system("/etc/security/msec/init.sh ". $m{$level}); + $in->resume; } $in->exit(0); diff --git a/perl-install/standalone/drakxconf b/perl-install/standalone/drakxconf index 7a99b1ffc..8699b05a2 100755 --- a/perl-install/standalone/drakxconf +++ b/perl-install/standalone/drakxconf @@ -20,7 +20,7 @@ my $in = vnew interactive('su'); my $choice = $in->ask_from_list("drakxconf", _("Choose the tool you want to use"), [ grep { my $prog = $_; int grep { -x "$_/$prog" } split ":", $ENV{PATH} } - qw(XFdrake adduserdrake diskdrake drakxservices keyboarddrake mousedrake netdrake printerdrake draksec adduserdrake) ]) or c::_exit(0); #- workaround for perl-GTK + qw(XFdrake adduserdrake diskdrake drakxservices keyboarddrake mousedrake netdrake printerdrake draksec) ]) or c::_exit(0); #- workaround for perl-GTK $in->end; diff --git a/perl-install/standalone/icons/findf.xpm b/perl-install/standalone/icons/findf.xpm index 91b25cee5..792007335 100644 --- a/perl-install/standalone/icons/findf.xpm +++ b/perl-install/standalone/icons/findf.xpm @@ -1,28 +1,31 @@ /* XPM */ -/* Drawn by Nico Schwiring and Mark Donohoe for the K Desktop Environment */ -/* See http://www.kde.org */ -static char*kfind[]={ -"16 16 6 1", -"# c #000000", -"d c #c0c0c0", -"a c #ffffff", -"b c #0000ff", -"c c #bebeff", -". c None", -".###########....", -"#aaaaaaaaaaa#...", -"#aaaaaaaabca#...", -"#aaaaaaaaaba#...", -"#aaaad###daa#...", -"#aaad#aaa#da#...", -"#aaa#acaca#a#...", -"#aaa#abbaa#a#...", -"#aaa#aabca#a#...", -"#aaad#aaa##a#...", -"#bcaad####a##...", -"#abaaaaaaa#a#...", -"#aaaaaaaaaa#a#..", -"#aabcaaaaaaa#a#.", -".###########.#a#", -"..............#."}; - +static char * findf_xpm[] = { +"16 22 6 1", +" c None", +". c #000000", +"+ c #FFFFFF", +"@ c #0000FF", +"# c #BEBEFF", +"$ c #C0C0C0", +" ", +" ", +" ", +" ........... ", +".+++++++++++. ", +".++++++++@#+. ", +".+++++++++@+. ", +".++++$...$++. ", +".+++$.+++.$+. ", +".+++.+#+#+.+. ", +".+++.+@@++.+. ", +".+++.++@#+.+. ", +".+++$.+++..+. ", +".@#++$....+.. ", +".+@+++++++.+. ", +".++++++++++.+. ", +".++@#+++++++.+. ", +" ........... .+.", +" . ", +" ", +" ", +" "}; diff --git a/perl-install/standalone/icons/ftin.xpm b/perl-install/standalone/icons/ftin.xpm index e70d56d19..d0326d3ce 100644 --- a/perl-install/standalone/icons/ftin.xpm +++ b/perl-install/standalone/icons/ftin.xpm @@ -1,24 +1,30 @@ /* XPM */ -static char * kmfolderin_xpm[] = { -/* width height num_colors chars_per_pixel */ -"15 13 5 1", -/* colors */ +static char * ftin_xpm[] = { +"15 22 5 1", " c None", -". c red3", -"X c white", -"o c #c0c0c0", -"O c #808080", -/* pixels */ +". c #CD0000", +"+ c #FFFFFF", +"@ c #C0C0C0", +"# c #808080", +" ", +" ", +" ", +" ", +" ", " . . ", " ... ", -" ...XXXXXXXX", -" ...ooooooXX", -" .......XXXXXO", -" .....oooXXOX", -" XX...XXXXXOXO", -" Xooo.oooXXOXOX", -"XXXXXXXXXXOXOX ", -"OOOOOOOOOOXOX ", -"XXXXXXXXXXOX ", -"OOOOOOOOOOX ", -"XXXXXXXXXX "}; +" ...++++++++", +" ...@@@@@@++", +" .......+++++#", +" .....@@@++#+", +" ++...+++++#+#", +" +@@@.@@@++#+#+", +"++++++++++#+#+ ", +"##########+#+ ", +"++++++++++#+ ", +"##########+ ", +"++++++++++ ", +" ", +" ", +" ", +" "}; diff --git a/perl-install/standalone/icons/ftout.xpm b/perl-install/standalone/icons/ftout.xpm index db28a8e5d..b4e0135b8 100644 --- a/perl-install/standalone/icons/ftout.xpm +++ b/perl-install/standalone/icons/ftout.xpm @@ -1,24 +1,30 @@ /* XPM */ -static char * kmfolderout_xpm[] = { -/* width height num_colors chars_per_pixel */ -"15 13 5 1", -/* colors */ +static char * ftout_xpm[] = { +"15 22 5 1", " c None", -". c blue4", -"X c white", -"o c #c0c0c0", -"O c #808080", -/* pixels */ +". c #00008B", +"+ c #FFFFFF", +"@ c #C0C0C0", +"# c #808080", +" ", +" ", +" ", +" ", +" ", " . ", " ... ", -" .....XXXXXXX", -" .......ooooXX", -" ...XXXXXXXO", -" X...ooooXXOX", -" XX...XXXXXOXO", -" Xoo.X.ooXXOXOX", -"XXXXXXXXXXOXOX ", -"OOOOOOOOOOXOX ", -"XXXXXXXXXXOX ", -"OOOOOOOOOOX ", -"XXXXXXXXXX "}; +" .....+++++++", +" .......@@@@++", +" ...+++++++#", +" +...@@@@++#+", +" ++...+++++#+#", +" +@@.+.@@++#+#+", +"++++++++++#+#+ ", +"##########+#+ ", +"++++++++++#+ ", +"##########+ ", +"++++++++++ ", +" ", +" ", +" ", +" "}; diff --git a/perl-install/standalone/keyboarddrake b/perl-install/standalone/keyboarddrake index 96d345ae6..d2177b459 100755 --- a/perl-install/standalone/keyboarddrake +++ b/perl-install/standalone/keyboarddrake @@ -13,7 +13,7 @@ local $_ = join '', @ARGV; /-h/ and die "usage: keyboarddrake [--expert]\n"; -$::expert = /--expert/; +$::expert = /-expert/; $::isStandalone = 1; my $in = vnew interactive('su'); diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index 9e39557f8..1682295e1 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -11,9 +11,9 @@ local $_ = join '', @ARGV; /-h/ and die "usage: mousedrake [--auto] [--noauto] [--testing]\n"; -$::auto = /--auto/; -$::noauto = /--noauto/; -$::testing = /--testing/; +$::auto = /-auto/; +$::noauto = /-noauto/; +$::testing = /-testing/; $::isStandalone = 1; my $in = vnew interactive('su'); diff --git a/perl-install/standalone/printerdrake b/perl-install/standalone/printerdrake index 6f5a03218..76caa66c1 100755 --- a/perl-install/standalone/printerdrake +++ b/perl-install/standalone/printerdrake @@ -28,12 +28,12 @@ local $_ = join '', @ARGV; /-h/ and die "usage: printerdrake [--beginner] [--expert] [--auto] [--noauto] [--skiptest] [--testing]\n"; -$::beginner = /--beginner/; -$::expert = /--expert/; -$::auto = /--auto/; -$::noauto = /--noauto/; -$::skiptest = /--skiptest/; -$::testing = /--testing/; +$::beginner = /-beginner/; +$::expert = /-expert/; +$::auto = /-auto/; +$::noauto = /-noauto/; +$::skiptest = /-skiptest/; +$::testing = /-testing/; $::isStandalone = 1; my $in = vnew interactive('su'); |