1 files changed, 15 insertions, 32 deletions
diff --git a/Master/tl-portable b/Master/tl-portable
index a698de457e6..3d02bbce29f 100755
--- a/Master/tl-portable
+++ b/Master/tl-portable
@@ -29,7 +29,6 @@ unset TEXDIR0
 dirsave=`pwd`
 cd $TEXDIR
 TEXDIR=`pwd`
-export TEXDIR
 cd $dirsave
 
 # Test whether the TeX Live directory is writable.  We need an actual
@@ -55,36 +54,8 @@ testfile=1
 else
   TEXDIRW=$HOME/.tlportable2010
 fi
-export TEXDIRW
 echo Using $TEXDIRW for generated files.
 
-# Use $TEXMFHOME for private data,
-# $TEXMFLOCAL for department- or workgroup data.
-# It is allright if $TEXMFLOCAL does not exist.
-
-TEXMFSYSVAR=$TEXDIRW/texmf-var
-if test -d $TEXDIR/texmf-var; then
-  TEXMFSYSVAR=$TEXDIR/texmf-var
-fi
-export TEXMFSYSVAR
-TEXMFSYSCONFIG=$TEXDIRW/texmf-config
-if test -f $TEXDIR/texmf-config; then
-  TEXMFSYSCONFIG=$TEXDIR/texmf-config
-fi
-export TEXMFSYSCONFIG
-TEXMFMAIN=$TEXDIR/texmf
-export TEXMFMAIN
-TEXMFDIST=$TEXDIR/texmf-dist
-export TEXMFDIST
-TEXMFLOCAL=$TEXDIR/texmf-local
-export TEXMFLOCAL
-TEXMFHOME=$TEXDIRW/texmf-home
-export TEXMFHOME
-TEXMFVAR=$TEXDIRW/texmf-var
-export TEXMFVAR
-TEXMFCONFIG=$TEXDIRW/texmf-config
-export TEXMFCONFIG
-
 platform=`$TEXDIR/install-tl --print-arch`
 
 if test "$platform" = ""; then
@@ -95,11 +66,23 @@ elif test ! -d $TEXDIR/bin/$platform; then
   exit 1
 fi
 
-if $TEXDIR/install-tl --portable; then :; else
-  echo "$0: Initialization of TeX Live failed!" >&2
-  exit 1
+if test "$TEXDIR" = "$TEXDIRW"; then 
+  TEXMFCNF=$TEXDIRW
+else
+  TEXMFCNF=$TEXDIRW/texmf-var/web2c
+  export TEXMFCNF
 fi
 
+if test ! -r $TEXMFCNF/texmf.cnf; then
+  TEXLIVE_INSTALL_PREFIX=$TEXDIRW
+  export TEXLIVE_INSTALL_PREFIX
+  if $TEXDIR/install-tl --portable --from_dvd --profile /dev/null; then :; else
+    echo "$0: Initialization of TeX Live for portable use failed!" >&2
+    exit 1
+  fi
+  unset TEXLIVE_INSTALL_PREFIX
+fi
+  
 # Try to block initialization scripts.
 # Set custom prompt for secondary shell, but
 # I know of no good way to do this for the C shell.