summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl.pl19
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm2
2 files changed, 19 insertions, 2 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 9f3ddf067bb..72d7fe42dcf 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -51,6 +51,23 @@ use TeXLive::TLConfig qw($DefaultContainerExtension $InfraLocation);
if (win32) {
require TeXLive::TLWinGoo;
+ TeXLive::TLWinGoo->import( qw(
+ &wg_error
+ &admin
+ &non_admin
+ &reg_country
+ &dir_writable
+ &expand_string
+ &global_tmpdir
+ &get_system_path
+ &get_user_path
+ &add_texbindir_to_path
+ &remove_texbindirs_from_path
+ &register_script_type
+ &unregister_script_type
+ &broadcast_env
+ &update_assocs
+ ));
}
use Getopt::Long;
$Getopt::Long::autoabbrev=0;
@@ -141,7 +158,7 @@ GetOptions("media=s" => \$opt_media,
"netarchive=s" => \$::netarchive,
"diskarchive=s" => \$::diskarchive,
"lang=s" => \$::lang,
- "print-arch" => \$opt_arch,
+ "print-arch" => \$opt_arch,
"d" => \$opt_debug,
"dd" => \$opt_ddebug,
"ddd" => \$opt_dddebug,
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 2bb9384b2a8..4f4d974a217 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -682,7 +682,7 @@ sub update_assocs() {
my $update_fu = new Win32::API('shell32', 'SHChangeNotify', 'LIPP', 'V');
if ($update_fu) {
tllog ($::LOG_DDEBUG, "Notifying changes in filetypes...\n");
- $update_fu->Call (SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0) if $update_fu;
+ $update_fu->Call (SHCNE_ASSOCCHANGED, SHCNF_IDLIST, 0, 0);
tllog ($::LOG_DDEBUG, "Done notifying\n");
} else {
tllog ($::LOG_DDEBUG, "No update_fu\n");