diff options
Diffstat (limited to 'perl-install')
| -rwxr-xr-x | perl-install/standalone/drakfloppy | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/drakfont | 10 | ||||
| -rwxr-xr-x | perl-install/standalone/net_monitor | 4 |
3 files changed, 13 insertions, 5 deletions
diff --git a/perl-install/standalone/drakfloppy b/perl-install/standalone/drakfloppy index 627f1d2a6..ea90e748b 100755 --- a/perl-install/standalone/drakfloppy +++ b/perl-install/standalone/drakfloppy @@ -32,6 +32,10 @@ use common; use my_gtk qw(:helpers); use ugtk qw(:helpers); +#- languages that can't be displayed with gtk1, so we unset translations +#- for them until this tool is ported to gtk2 +if ($ENV{LANGUAGE} =~ /\b(ar|he|hi|ta)/) { $ENV{LANGUAGE} = "C" }; + require_root_capability(); my $expert_mode = 0; diff --git a/perl-install/standalone/drakfont b/perl-install/standalone/drakfont index 42a6ff42b..4200b0b7b 100755 --- a/perl-install/standalone/drakfont +++ b/perl-install/standalone/drakfont @@ -362,7 +362,7 @@ sub put_font_dir { my $ttfdir = $drakfont_dir . "/ttf"; # mkttfdir only knows about iso-8859-1, using ttmkfdir -u instead -- pablo #`$mkttfdir $ttfdir`; - system("cd $ttfdir && $fccache . && $ttmkfdir -u > fonts.dir"); + system("cd $ttfdir && $fccache && $ttmkfdir -u > fonts.dir"); $interactive and progress($pbar2, 0.10, N("True Type install done")); my $update_chkfontpath = "$chkfontpath -a $drakfont_dir/ttf"; @@ -379,7 +379,7 @@ sub put_font_dir { and system("cd $drakfont_dir/tmp/Type1 && cat Fontmap >> `rpm -ql ghostscript | grep Fontmap.GS` "); system("cd $drakfont_dir/tmp/Type1 && mv *.pfm *.gsf *.afm *.pfb ../../Type1 "); my $type1dir = $drakfont_dir . "/Type1"; - system("cd $type1dir && $fccache . && $type1inst"); + system("cd $type1dir && $fccache && $type1inst"); $interactive and progress($pbar2, 0.05, N("Ghostscript referencing")); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } @@ -395,7 +395,7 @@ sub put_font_dir { system("cd $drakfont_dir/tmp/Type1 && cat Fontmap >> `rpm -ql ghostscript | grep Fontmap.GS` "); system("cd $drakfont_dir/tmp/Type1 && mv *.pfm *.afm *.gsf *.pfb ../../Type1 "); my $type1dir = $drakfont_dir . "/Type1"; - system("cd $type1dir && $fccache . && $type1inst"); + system("cd $type1dir && $fccache && $type1inst"); $interactive and progress($pbar2, 0.05, N("Ghostscript referencing")); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } @@ -414,7 +414,7 @@ sub put_font_dir { system("cd $drakfont_dir/tmp/tmp && mv *.afm ../Type1"); system("cd $drakfont_dir/tmp/Type1 && mv *.afm ../../Type1 "); my $type1dir = $drakfont_dir . "/Type1"; - system("cd $type1dir && $fccache . && $type1inst"); + system("cd $type1dir && $fccache && $type1inst"); $interactive and progress($pbar2, 0.14, N("type1inst building")); $update_chkfontpath .= "; $chkfontpath -a $drakfont_dir/Type1"; } @@ -463,7 +463,7 @@ sub remove_fonts { if (/.ttf$/) { rm_rf($_); # rebuild of the fonts.dir and fc-cache files - system("cd `dirname $_` && $fccache . && $ttmkfdir -u > fonts.dir"); + system("cd `dirname $_` && $fccache && $ttmkfdir -u > fonts.dir"); } else { rm_rf($i) } } diff --git a/perl-install/standalone/net_monitor b/perl-install/standalone/net_monitor index cc10ce093..8889986d0 100755 --- a/perl-install/standalone/net_monitor +++ b/perl-install/standalone/net_monitor @@ -23,6 +23,10 @@ use lib qw(/usr/lib/libDrakX); use strict; use standalone; #- warning, standalone must be loaded very first, for 'explanations' +#- languages that can't be displayed with gtk1, so we unset translations +#- for them until this tool is ported to gtk2 +if ($ENV{LANGUAGE} =~ /\b(ar|he|hi|ta)/) { $ENV{LANGUAGE} = "C" }; + use my_gtk qw(:helpers :wrappers); use common; use network::netconnect; |