texlive[43939] Master/install-tl: set defaults for

[commits+preining at tug.org]

Revision: 43939
          http://tug.org/svn/texlive?view=revision&revision=43939
Author:   preining
Date:     2017-04-20 16:47:40 +0200 (Thu, 20 Apr 2017)
Log Message:
-----------
set defaults for TEXMF{VAR,CONFIG,HOME} on darwin

Modified Paths:
--------------
    trunk/Master/install-tl

Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl	2017-04-20 05:52:38 UTC (rev 43938)
+++ trunk/Master/install-tl	2017-04-20 14:47:40 UTC (rev 43939)
@@ -1430,17 +1430,29 @@
                     ? abs_path($::installerdir) : $vars{'TEXDIR'};
 
   my $texmfhome = getenv('TEXLIVE_INSTALL_TEXMFHOME');
-  $texmfhome ||= "~";
+  if (platform() =~ m/darwin/) {
+    $texmfhome ||= "~/Library";
+  } else {
+    $texmfhome ||= "~";
+  }
   $vars{'TEXMFHOME'} = "$texmfhome/texmf";
 
   # use the $texmfhome value just computed for these.
   my $yyyy = $TeXLive::TLConfig::ReleaseYear;
   my $texmfvar = getenv('TEXLIVE_INSTALL_TEXMFVAR');
-  $texmfvar ||= "$texmfhome/.texlive$yyyy/texmf-var";
+  if (platform() =~ m/darwin/) {
+    $texmfvar ||= "$texmfhome/texlive/$yyyy/texmf-var";
+  } else {
+    $texmfvar ||= "$texmfhome/.texlive$yyyy/texmf-var";
+  }
   $vars{'TEXMFVAR'} = $texmfvar;
 
   my $texmfconfig = getenv('TEXLIVE_INSTALL_TEXMFCONFIG');
-  $texmfconfig ||= "$texmfhome/.texlive$yyyy/texmf-config";
+  if (platform() =~ m/darwin/) {
+    $texmfconfig ||= "$texmfhome/texlive/$yyyy/texmf-config";
+  } else {
+    $texmfconfig ||= "$texmfhome/.texlive$yyyy/texmf-config";
+  }
   $vars{'TEXMFCONFIG'} = $texmfconfig;
 
   # for portable installation we want everything in one directory