summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-11-02 11:55:48 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-11-02 11:55:48 +0000
commita1ac4ebd66fb5b76f21d70cedb17a01184cfa73b (patch)
treef61adab8ae93d27188ef8ecdcc1740d7d31eb82e /Master/install-tl
parent162795e0cfa21f283d401c8a81188ea319c42c91 (diff)
Win32: added environment-related debug output.
Also doesn't try to import program_exists git-svn-id: svn://tug.org/texlive/trunk@11154 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl15
1 files changed, 10 insertions, 5 deletions
diff --git a/Master/install-tl b/Master/install-tl
index d7656e4cc80..938a7fbdead 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -11,7 +11,7 @@
# TODO:
# - if -gui is given make the check on availability *before* loading the
# tlpdb to give people a chance to Ctrl-C (or even ask them whether they
-# want to continue or not) and install missing components first before
+# want to continue or not) and install missing components first before
# (uselessly) loading the tlpdb (Werner 28.10.08)
# - with -gui pop up a transient window showing:
# testing for compressed archive packages ...
@@ -57,7 +57,7 @@ BEGIN {
use Getopt::Long qw(:config no_autoabbrev);
use TeXLive::TLUtils qw(platform platform_desc
- which getenv win32 unix program_exists info log debug tlwarn ddebug
+ which getenv win32 unix info log debug tlwarn ddebug
get_system_tmpdir member process_logging_options rmtree
mkdirhier make_var_skeleton make_local_skeleton install_package copy
install_packages dirname setup_programs welcome welcome_paths);
@@ -198,7 +198,7 @@ GetOptions(
"print-arch" => \$opt_print_arch,
"profile-seed=s" => \$opt_profileseed,
"profile=s" => \$opt_profile,
- "scheme=s" => \$opt_scheme,
+ "scheme=s" => \$opt_scheme,
"version" => \$opt_version,
"help|?" => \$opt_help) or pod2usage(1);
@@ -1076,6 +1076,11 @@ operations might be disturbed.\n\n";
# post install actions
#
+ if (win32()) {
+ debug "Actual environment:\n".`set`."\n\n";
+ debug 'Effective TEXMFCNF: '.`kpsewhich -expand-path=\$TEXMFCNF`."\n";
+ }
+
# (re-)initialize batchfile for uninstalling shortcuts
if (win32() and !$opt_portable) {
mkdirhier("$TEXDIRW/tlpkg/installer") if $vars{'from_dvd'};
@@ -1273,11 +1278,11 @@ sub do_texmf_cnf {
print TMF <<EOF;
% This texmf.cnf file should contain only your personal changes from the
% main texmf.cnf.
-%
+%
% Do NOT change values in the main file (which is in
% .../texlive/YYYY/texmf/web2c/texmf.cnf), as YOUR CHANGES WILL BE LOST
% by later updates.
-%
+%
% If you need to make changes to texmf.cnf, put your custom settings in
% this file instead, which is YYYY/texmf.cnf. And insert *only* your
% changed values.