summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-07-23 13:31:08 +0000
committerNorbert Preining <preining@logic.at>2017-07-23 13:31:08 +0000
commit58f4676b08059aa9e7d04becc006494c0ad0386e (patch)
tree51d760e90ef37a029dea4e43f952875108378724 /Master/install-tl
parent62012ddf76cfb1d21e44055d61bfc80d81c318ac (diff)
path add: do proper return code handling
git-svn-id: svn://tug.org/texlive/trunk@44872 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl12
1 files changed, 8 insertions, 4 deletions
diff --git a/Master/install-tl b/Master/install-tl
index b0941dcbfed..7ce895d60d6 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1113,7 +1113,7 @@ operations might be disturbed.\n\n";
# on Unix set symlinks
# for portable, this option should be unset
# it should not be necessary to test separately for portable
- do_path_adjustments() if
+ $errcount += do_path_adjustments() if
$vars{'instopt_adjustpath'} and $vars{tlpdbopt_desktop_integration} != 2;
# now do the system integration:
@@ -1199,17 +1199,21 @@ sub rewrite_tlaunch_ini {
} # rewrite_tlaunch_ini
sub do_path_adjustments {
+ my $ret = 0;
info ("running path adjustment actions\n");
if (win32()) {
TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'}.'/bin/win32',
$vars{'tlpdbopt_w32_multi_user'});
broadcast_env();
} else {
- TeXLive::TLUtils::add_symlinks($vars{'TEXDIR'}, $vars{'this_platform'},
- $vars{'tlpdbopt_sys_bin'}, $vars{'tlpdbopt_sys_man'},
- $vars{'tlpdbopt_sys_info'});
+ if (!TeXLive::TLUtils::add_symlinks($vars{'TEXDIR'}, $vars{'this_platform'},
+ $vars{'tlpdbopt_sys_bin'}, $vars{'tlpdbopt_sys_man'},
+ $vars{'tlpdbopt_sys_info'})) {
+ $ret = 1;
+ }
}
info ("finished with path adjustment actions\n");
+ return $ret;
} # do_path_adjustments