summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-06-01 17:36:30 +0000
committerKarl Berry <karl@freefriends.org>2012-06-01 17:36:30 +0000
commiteb4161fb523a13b3d4c91f51bf1f98483090bf30 (patch)
treef312c560de7edefc69bd203a220b5508f6946d16 /Build
parent81fc7e5f8e512a8abc7c87d41cd617fb99e04162 (diff)
play with $prg(ram name)
git-svn-id: svn://tug.org/texlive/trunk@26778 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/tetex/ChangeLog4
-rwxr-xr-xBuild/source/texk/tetex/updmap.pl16
2 files changed, 12 insertions, 8 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index f8d644287f0..59bf86d752c 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-01 Karl Berry <karl@tug.org>
+
+ * updmap.pl: consistently use $prg, and remove .pl suffix.
+
2012-05-31 Karl Berry <karl@tug.org>
* updmap.pl (reset_root_home): accept /var/root.
diff --git a/Build/source/texk/tetex/updmap.pl b/Build/source/texk/tetex/updmap.pl
index c7c462f5e49..73aaea44834 100755
--- a/Build/source/texk/tetex/updmap.pl
+++ b/Build/source/texk/tetex/updmap.pl
@@ -43,7 +43,7 @@ use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname
#use Data::Dumper;
#$Data::Dumper::Indent = 1;
-my $prg = basename($0);
+(my $prg = basename($0)) =~ s/\.pl$//;
# sudo sometimes does not reset the home dir of root, check on that
# see more comments at the definition of the function itself
@@ -1687,10 +1687,10 @@ sub read_updmap_file {
if ($b eq "Map" || $b eq "MixedMap" || $b eq "KanjiMap") {
my $c = shift @rest;
if (!defined($c)) {
- warning("updmap: apparently not a real disable line, ignored: $_\n");
+ warning("$prg: apparently not a real disable line, ignored: $_\n");
} else {
if (defined($data{'maps'}{$c})) {
- warning("updmap: double mentioning of $c in $fn\n");
+ warning("$prg: double mention of $c in $fn\n");
}
$data{'maps'}{$c}{'status'} = 'disabled';
$data{'maps'}{$c}{'type'} = $b;
@@ -1700,25 +1700,25 @@ sub read_updmap_file {
next;
}
if (@rest) {
- warning("updmap: line $i in $fn contains a syntax error, more than two words!\n");
+ warning("$prg: line $i in $fn contains a syntax error, more than two words!\n");
}
if (defined($settings{$a})) {
if (check_option($a, $b)) {
$data{'setting'}{$a}{'val'} = $b;
$data{'setting'}{$a}{'line'} = $i;
} else {
- warning("updmap: unknown setting for $a: $b, ignored!\n");
+ warning("$prg: unknown setting for $a: $b, ignored!\n");
}
} elsif ($a eq "Map" || $a eq "MixedMap" || $a eq "KanjiMap") {
if (defined($data{'maps'}{$b}) && $data{'maps'}{$b}{'type'} ne $a) {
- warning("updmap: double mentioning of $b with conflicting types in $fn\n");
+ warning("$prg: double mention of $b with conflicting types in $fn\n");
} else {
$data{'maps'}{$b}{'type'} = $a;
$data{'maps'}{$b}{'status'} = 'enabled';
$data{'maps'}{$b}{'line'} = $i;
}
} else {
- warning("updmap: unrecognized line $i in $fn: $_\n");
+ warning("$prg: unrecognized line $i in $fn: $_\n");
}
}
return \%data;
@@ -1876,7 +1876,7 @@ sub merge_data {
sub reset_root_home {
if (!win32() && ($> == 0)) { # $> is effective uid
my $envhome = $ENV{'HOME'};
- # if $HOME isn't an existing directory, that's ok; TLU does this.
+ # if $HOME isn't an existing directory, we don't care.
if (defined($envhome) && (-d $envhome)) {
# we want to avoid calling getpwuid as far as possible, so if
# $envhome is one of some usual values we accept it without worrying.