Fixes for tl-portable

git-svn-id: svn://tug.org/texlive/trunk@9386 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 18 insertions, 17 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 8ec18150c02..411d622a99f 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -232,6 +232,7 @@ if ($opt_nonadmin and win32()) { non_admin(); }
 # $tlpdb must be our because it is used in install-menu-text.pl
 our $tlpdb;
 my $localtlpdb;
+my $location;
 
 # $finished == 1 if the menu call already did the installation
 my $finished = 0;
@@ -250,16 +251,16 @@ if ($opt_arch) {
   exit 0;
 } elsif ($opt_portable) {
   $::opt_verbosity = -1;
-  # initialize_installer:
-  $media = "DVD";
   $::_platform_ = platform();
-  $vars{'TEXDIR'} = getenv('TEXDIR');
+  $location = getenv('TEXDIR');
+  $vars{'TEXDIR'} = $location;
   if (not -d $vars{'TEXDIR'}.'/bin/'.$::_platform_) { # shouldn't happen
     print "Platform ".$::_platform_." not supported\n";
     exit 1;
   }
   # set_platforms_supported();
   # set_texlive_default_dirs();
+  $vars{'TEXDIRW'} = getenv('TEXDIRW');
   $vars{'TEXMFSYSVAR'} = getenv('TEXMFSYSVAR');
   $vars{'TEXMFSYSCONFIG'} = getenv('TEXMFSYSCONFIG');
   $vars{'TEXMFLOCAL'} = getenv('TEXMFLOCAL');
@@ -306,7 +307,7 @@ $ENV{'WGETRC'}="$::installerdir/tlpkg/installer/wgetrc";
 #
 # determine from where we do install
 #
-my $location = $opt_location;
+$location = $opt_location;
 $location || ($location = "$::installerdir");
 if ($location =~ m!^(http|ftp)://!i) {
   $location =~ s,/(tlpkg)?/*$,,;  # remove any trailing tlpkg or /
@@ -921,7 +922,7 @@ operations might be disturbed.\n\n";
   #
 
   # (re-)initialize batchfile for uninstalling shortcuts
-  if (win32()) {
+  if (win32() and !$opt_portable) {
     mkdirhier("$TEXDIRW/tlpkg/installer") if $vars{'from_dvd'};
     init_unshortbat($TEXDIRW);
   }
@@ -1105,11 +1106,11 @@ sub do_texmf_cnf {
 % This is the texmf.cnf file which contains only changes from the
 % texmf.cnf distributed for the release of year YYYY, which is in
 % TLROOT/YYYY/texmf/web2c/texmf.cnf.
-% 
+%
 % Please do NOT change values in this YYYY/texmf/web2c/texmf.cnf file,
 % as they may be overwritten by later updates of the kpathsea
 % package(s).
-% 
+%
 % Instead, if you want to configure something to a value different from
 % the one in texmf/web2c/texmf.cnf, just put the changed value here.
 %
@@ -1198,7 +1199,7 @@ sub check_on_lang_collection_installed {
     return 1 if $vars{"$c"};
   }
   if ($vars{"selected_scheme"} eq "scheme-context") {
-    # context 
+    # context
     return 1;
   }
   return 0;
@@ -1325,7 +1326,7 @@ scripts instead of this option.  See below for details.
 Omit normal informational messages.
 
 =item B<-v>
- 
+
 Include debugging messages; repeat for maximum debugging, as in C<-vv>.
 (Further repeats are accepted and ignored.)
 
diff --git a/Master/tl-portable.bat b/Master/tl-portable.bat
index 15b608eee39..222e1e5fe77 100755
--- a/Master/tl-portable.bat
+++ b/Master/tl-portable.bat
@@ -12,31 +12,31 @@ set tldrive=%~d0
 cd %TEXDIR%
 
 rem TEXDIR writable?
-set tlwrite=%USERPROFILE%\texlive2008\
+set TEXDIRW=%USERPROFILE%\texlive2008\
 del "%TEXDIR%tl_wrtest" 2>nul
 echo Testing for write access %TEXDIR%...
 echo Hello >"%TEXDIR%tl_wrtest"
 if not exist "%TEXDIR%tl_wrtest" goto wrtestdone
 del "%TEXDIR%tl_wrtest"
-set tlwrite=%TEXDIR%
+set TEXDIRW=%TEXDIR%
 :wrtestdone
-if not exist "%tlwrite%" md "%tlwrite%"
+if not exist "%TEXDIRW%" md "%TEXDIRW%"
 
 rem Use TEXMFHOME for private data,
 rem TEXMFLOCAL for department- or workgroup data.
 rem It is allright if TEXMFLOCAL does not exist.
 
-set TEXMFSYSVAR=%tlwrite%texmf-var
+set TEXMFSYSVAR=%TEXDIRW%texmf-var
 if exist "%TEXDIR%texmf-var" set TEXMFSYSVAR=%TEXDIR%texmf-var
 
-set TEXMFSYSCONFIG=%tlwrite%texmf-config
+set TEXMFSYSCONFIG=%TEXDIRW%texmf-config
 if exist "%TEXDIR%texmf-config" set TEXMFSYSCONFIG=%TEXDIR%texmf-config
 set TEXMFMAIN=%TEXDIR%texmf
 set TEXMFDIST=%TEXDIR%texmf-dist
 set TEXMFLOCAL=%TEXDIR%texmf-local
-set TEXMFHOME=%tlwrite%texmf-home
-set TEXMFVAR=%tlwrite%texmf-var
-set TEXMFCONFIG=%tlwrite%texmf-config
+set TEXMFHOME=%TEXDIRW%texmf-home
+set TEXMFVAR=%TEXDIRW%texmf-var
+set TEXMFCONFIG=%TEXDIRW%texmf-config
 set TEXBINDIR=%TEXDIR%bin\win32
 set platform=win32