summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/ChangeLog3
-rw-r--r--perl-install/share/po/i18n_compssUsers32
2 files changed, 21 insertions, 14 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 0a6555c3d..d97c8f43e 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -2,6 +2,9 @@
* netconnect.pm: fixed syntax error.
+ * share/po/i18n_compssUsers: simplified version and fixed
+ dependancies to pkgs.pm (for building drakxtools).
+
2000-10-04 François Pons <fpons@mandrakesoft.com>
* install_gtk.pm: removed 80 pixel on height for live upgrade.
diff --git a/perl-install/share/po/i18n_compssUsers b/perl-install/share/po/i18n_compssUsers
index 70ccd15d2..8ce0a9233 100644
--- a/perl-install/share/po/i18n_compssUsers
+++ b/perl-install/share/po/i18n_compssUsers
@@ -1,23 +1,28 @@
#!/usr/bin/perl
-BEGIN {
- # fake module ``c'' so that no need to build DrakX
- $INC{'c.pm'} = 1;
- package c; sub AUTOLOAD { } sub getpagesize { 1024 } # getpagesize is needed by swap.pm, otherwise sigsegv
-}
-
use lib "../..";
-use pkgs;
use common ":common";
-
sub get {
my ($meta_class) = @_;
- local *install_any::getFile = sub {
- open GETFILE, "../compssUsers$meta_class" and *GETFILE;
- };
- my (undef, undef, undef, $descr) = pkgs::readCompssUsers([{}], [], $meta_class);
- %$descr;
+ my %compssUsersDescr;
+
+ local *F;
+ open F, "../compssUsers$meta_class" or die "can't open file ../compssUsers$meta_class";
+ foreach (<F>) {
+ /^\s*$/ || /^#/ and next;
+ s/#.*//;
+
+ if (/^(\S.*)/) {
+ my ($icon, $descr);
+ /^(.*?)\s*\[icon=(.*?)\](.*)/ and $_ = "$1$3", $icon = $2;
+ /^(.*?)\s*\[descr=(.*?)\](.*)/ and $_ = "$1$3", $descr = $2;
+ $compssUsersDescr{$_} = $descr;
+ }
+ }
+ close F;
+
+ %compssUsersDescr;
}
foreach (uniq(get(''), get('.desktop'))) {
@@ -28,4 +33,3 @@ msgid "$_"
msgstr ""
);
}
-