summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-03-21 14:40:07 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-03-21 14:40:07 +0000
commit86c756ee6f056328a39127f60560f00a7fde7cb3 (patch)
tree714d10ec9f10b151b62345a5e22f68858d154f6e /Master
parente00da5b615d20b87901c7faf820c489912f78870 (diff)
tl-portable.[sh|bat] now bails out if install-tl fails.
git-svn-id: svn://tug.org/texlive/trunk@7060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tl-portable.bat5
-rwxr-xr-xMaster/tl-portable.sh11
2 files changed, 12 insertions, 4 deletions
diff --git a/Master/tl-portable.bat b/Master/tl-portable.bat
index 796fd30e4e5..2ff66602d29 100755
--- a/Master/tl-portable.bat
+++ b/Master/tl-portable.bat
@@ -41,7 +41,12 @@ rem use provided Perl
set PERL5LIB=%TEXDIR%tlpkg\installer\perllib
"%TEXDIR%tlpkg\installer\perl" "%TEXDIR%install-tl.pl" --portable
+if not errorlevel 1 goto doit
+echo Initialization of TeXLive failed!
+pause
+exit
+:doit
path %TEXDIR%bin\win32;%path%
set PROMPT=TL $P$G
%COMSPEC% /k
diff --git a/Master/tl-portable.sh b/Master/tl-portable.sh
index b8d0658725c..d8b11e8011f 100755
--- a/Master/tl-portable.sh
+++ b/Master/tl-portable.sh
@@ -56,11 +56,14 @@ elif test ! -d $TEXDIR/bin/$platform; then
exit 1
fi
-$TEXDIR/install-tl.pl --portable
+if $TEXDIR/install-tl.pl --portable; then :; else
+ echo Initialization of TeXLive failed!
+ exit 1
+fi
-#; try to block initialization scripts and
-# set custom prompt for secondary shell
-# but I know of no good way to do this for the C shell.
+# 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.
if test "$SHELL" = /bin/bash; then
TLARGS=--norc