summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-06-16 08:53:43 +0000
committerNorbert Preining <preining@logic.at>2017-06-16 08:53:43 +0000
commitbdb5d3ff840e8ff0dc1ba58c0f06da613965ab19 (patch)
tree06707cec2046aa145f1995ad37d35ff29e0206bf
parent99efbb390c8158ba2890c5537e94d828eaa373f9 (diff)
fix missing profile key renames
git-svn-id: svn://tug.org/texlive/trunk@44614 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl15
1 files changed, 15 insertions, 0 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 771335e0db6..e0554b48228 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1822,11 +1822,22 @@ sub read_profile {
'option_sys_bin' => 'tlpdbopt_sys_bin',
'option_sys_info' => 'tlpdbopt_sys_info',
'option_sys_man' => 'tlpdbopt_sys_man',
+ 'option_file_assocs' => 'tlpdbopt_file_assocs',
+ 'option_backupdir' => 'tlpdbopt_backupdir',
+ 'option_w32_multi_user' => 'tlpdbopt_w32_multi_user',
+ 'option_post_code' => 'tlpdbopt_post_code',
+ 'option_autobackup' => 'tlpdbopt_autobackup',
+ 'option_desktop_integration' => 'tlpdbopt_desktop_integration',
'option_adjustrepo' => 'instopt_adjustrepo',
'option_letter' => 'instopt_letter',
'option_path' => 'instopt_adjustpath',
'option_symlinks' => 'instopt_adjustpath',
'portable' => 'instopt_portable',
+ 'option_write18_restricted' => 'instopt_write18_restricted',
+ );
+ my %keylost = (
+ 'option_menu_integration' => 1,
+ 'in_place' => 1,
);
open PROFILE, "<$profilepath"
@@ -1846,6 +1857,10 @@ sub read_profile {
next if ($k eq "TEXDIRW");
# convert old keys to new keys
$k = $keyrename{$k} if ($keyrename{$k});
+ if ($keylost{$k}) {
+ tlwarn("Profile key `$k' is now ignored, please remove it.\n");
+ next;
+ }
$pro{$k} = $v;
$profiledata{$k} = $v;
}