diff options
| author | Norbert Preining <preining@logic.at> | 2012-02-06 14:48:29 +0000 |
|---|---|---|
| committer | Norbert Preining <preining@logic.at> | 2012-02-06 14:48:29 +0000 |
| commit | 7f90cbb0ac1436e9d3874ffcd17c8afdaad8f5e1 (patch) | |
| tree | bcf75484077ca20f614692cfb0c27fb79dc3a9fa | |
| parent | b08b88d03c2bc95bc3eaaa8537a4f4f8ada8fb55 (diff) | |
fix for win32
git-svn-id: svn://tug.org/texlive/trunk@25316 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/extra/jfontmaps/ChangeLog | 4 | ||||
| -rwxr-xr-x | Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl | 12 |
2 files changed, 11 insertions, 5 deletions
diff --git a/Build/source/extra/jfontmaps/ChangeLog b/Build/source/extra/jfontmaps/ChangeLog index 8c415e51caa..673879f3f4c 100644 --- a/Build/source/extra/jfontmaps/ChangeLog +++ b/Build/source/extra/jfontmaps/ChangeLog @@ -1,7 +1,9 @@ 2012-02-06 Norbert Preining <preining@logic.at> * scripts/updmap-setup-kanji.pl: change output of status to - only report family, change help text a bit + only report family, change help text a bit, + fix for win32, thanks Akira Kakuto + Version v0.9.3 2012-01-31 Norbert Preining <preining@logic.at> diff --git a/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl b/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl index ebd7897263b..32db8f818cb 100755 --- a/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl +++ b/Build/source/extra/jfontmaps/script/updmap-setup-kanji.pl @@ -19,7 +19,7 @@ use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; my $prg = "updmap-setup-kanji"; -my $vers = "0.9.2dev"; +my $vers = "0.9.3"; my $version = '$Id$'; my $updmap_real = "updmap-sys"; @@ -37,6 +37,12 @@ if (! GetOptions( die "Try \"$0 --help\" for more information.\n"; } + +sub win32 { return ($^O=~/^MSWin(32|64)$/i); } + +my $nul = (win32() ? 'nul' : '/dev/null') ; + + if ($dry_run) { $updmap = "echo updmap-sys"; } @@ -127,7 +133,7 @@ sub CheckInstallFont { sub check_mapfile { my $mapf = shift; - my $f = `kpsewhich $mapf 2>/dev/null`; + my $f = `kpsewhich $mapf 2> $nul`; my $ret = $?; if (wantarray) { return (!$ret, $f); @@ -236,8 +242,6 @@ sub SetupReplacement { sub main { my ($a, $b) = @_; - # mktexlsr 2> /dev/null - CheckInstallFont(); if (!defined($a) || defined($b)) { |