summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-01-20 23:25:16 +0000
committerKarl Berry <karl@freefriends.org>2007-01-20 23:25:16 +0000
commit229159218bb3da337134052c8b1e4c08e6568a11 (patch)
tree5b9130c5c61a92f91575a21a01227d50aafb378d
parent468dcc825f9a4c9046ecda481b0dbbde210297d3 (diff)
give warning if binaries are not available, from hartmut
git-svn-id: svn://tug.org/texlive/trunk@3641 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/common.sh11
-rwxr-xr-xMaster/install-compr.sh8
2 files changed, 15 insertions, 4 deletions
diff --git a/Master/common.sh b/Master/common.sh
index c69a5cb3f77..29f37cfb8ff 100755
--- a/Master/common.sh
+++ b/Master/common.sh
@@ -307,7 +307,14 @@ this_platform_set()
eval this_platform_fn=\$p_${this_system}_fn
all_systems_ns=1
fi
-
+ if { echo "$all_systems" | grep -q " $this_system"; } ; then
+ warn_nobin=""
+ else
+ warn_nobin="===> WARNING: No binaries for this platform on CD! <===
+There was not enough space, sorry. You can either select a different
+set of binaries from the <B> menu, or use the live image, or download
+the binaries separately vis rsync. See http://tug.org/texlive."
+ fi
}
TEXMFCNF__fix_texmf()
@@ -844,6 +851,7 @@ Other options:
'
screen_5='Current platform: $this_platform_n
+$warn_nobin
==============================================================================
<N> none of the entries below
<A> $p_i386_linux_n
@@ -1023,6 +1031,7 @@ init()
TEXMFHOME=${TEXLIVE_INSTALL_TEXMFHOME-'$HOME/texmf'}
VAR_CHANGE=""
LOCAL_CHANGE=""
+ warn_nobin=""
screen_1=' ===================> TeX Live installation procedure <==================
diff --git a/Master/install-compr.sh b/Master/install-compr.sh
index d808e74e4e7..4b5827de52a 100755
--- a/Master/install-compr.sh
+++ b/Master/install-compr.sh
@@ -60,9 +60,9 @@ series_init()
$echon "Initializing collections... "
setvars
- systems=`(cd $LISTS; ls bin-tex.* | sed -e 's/bin-tex.//')`
+ systems=`(cd $CDDIR/archive && find . -name "bin-t*.zip" | awk '{FS="."; if(NF==4) print $3}' | sort | uniq)`
- all_schemes=`(cd $LISTS; ls *.scheme | sed 's/\.scheme//' | sed 's/-/_/' | sort )`
+ all_schemes=`(cd $LISTS && ls *.scheme | sed 's/\.scheme//' | sed 's/-/_/' | sort )`
sc=24
for s in $all_schemes; do
S=`echo $s | sed -e 's/_/-/g'`
@@ -182,12 +182,14 @@ install_now()
################################################################
unset TEXCONFIG
init
-screen_1=' ===================> TeX Live installation procedure <==================
+this_platform_set
+screen_1='==================> TeX Live installation procedure <=================
===> Note: Letters/digits in <angle brackets> indicate menu items <===
===> for commands or configurable options <===
Proposed platform: $this_platform_n
+ $warn_nobin
<P> over-ride system detection and choose platform
<B> binary systems: $all_systems_ns out of $all_systems_anz
<S> Installation scheme ($selected_scheme)