summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-05-10 13:20:11 +0000
committerNorbert Preining <preining@logic.at>2009-05-10 13:20:11 +0000
commit7f5bb8e941c9261ede147fdf1628436cdb539a44 (patch)
tree67b315c3e79564f909594df49d21d685a29942b7
parent8296b8532673dfbb0169268a50529afef6f67992 (diff)
write installed archs to profile, and fix reading by chomp-ing
git-svn-id: svn://tug.org/texlive/branches/branch2009-dev@13027 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl4
1 files changed, 3 insertions, 1 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 07d083d4d60..ecc989cce22 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1185,7 +1185,8 @@ sub create_profile {
foreach my $key (sort keys %vars) {
print $fh "$key $vars{$key}\n"
if $key=~/^collection/ and $vars{$key}==1;
- print $fh "$key $vars{$key}\n" if $key=~/^option_/;
+ print $fh "$key $vars{$key}\n" if $key =~ /^option_/;
+ print $fh "$key $vars{$key}\n" if (($key =~ /^binary_/) && $vars{$key});
if ($vars{'option_desktop_integration'} && unix()) {
print $fh "sys_bin ", $vars{'sys_bin'}, "\n" if $key =~ /^sys_bin/;
print $fh "sys_man ", $vars{'sys_man'}, "\n" if $key =~ /^sys_man/;
@@ -1208,6 +1209,7 @@ sub read_profile {
or die "$0: Cannot open profile $profilepath for reading.\n";
my %pro;
while (<PROFILE>) {
+ chomp;
next if m/^[[:space:]]*$/; # skip empty lines
next if m/^[[:space:]]*#/; # skip comment lines
my ($k,$v) = split (" ", $_, 2); # value might have spaces