summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-28 22:54:16 +0000
committerKarl Berry <karl@freefriends.org>2019-01-28 22:54:16 +0000
commit48a5000aa02a246e4167f6ab85dc26685d17fb61 (patch)
tree8718a3350050feda175ebeeb0c920cbf3289a4bb /Master/install-tl
parentce06e970533ac446a5229a6e05dcbc305ef16075 (diff)
(read_profile): abort if value missing from
required keys. git-svn-id: svn://tug.org/texlive/trunk@49856 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl19
1 files changed, 8 insertions, 11 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 620893b4e4c..86287ba21f7 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -2015,9 +2015,7 @@ sub read_profile {
$vars{$_} = $pro{$_};
delete($pro{$_});
}
- next;
- }
- if (m/^tlpdbopt_/) {
+ } elsif (m/^tlpdbopt_/) {
my $o = $_;
$o =~ s/^tlpdbopt_//;
# we do not support setting the location in the profile
@@ -2027,15 +2025,14 @@ sub read_profile {
$vars{$_} = $pro{$_};
delete($pro{$_});
}
- next;
- }
- if (defined($path_keys{$_}) ||
- m/^selected_scheme$/ ||
- m/^binary_/ ||
- m/^collection-/) {
- $vars{$_} = $pro{$_};
+ } elsif (defined($path_keys{$_})
+ || m/^(selected_scheme$|binary|collection-)/) {
+ if ($pro{$_}) {
+ $vars{$_} = $pro{$_};
+ } else {
+ tldie("$0: Profile key must not be empty, quitting: $_\n");
+ }
delete($pro{$_});
- next;
}
}
#require Data::Dumper;