summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-01-08 00:04:37 +0000
committerKarl Berry <karl@freefriends.org>2007-01-08 00:04:37 +0000
commit26cde2e14ad7349cfe95a7f41ba7b080906b1c85 (patch)
treeeedd9f79f43594ecf3acd5a471f7df1aac7d14cb /Master
parent3eef247874e9926d5c919231a02da4da69f7c625 (diff)
do not lose TEXLIVE_INSTALL_TEXMFHOME override
git-svn-id: svn://tug.org/texlive/trunk@3222 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/common.sh5
-rwxr-xr-xMaster/install-live.sh5
2 files changed, 2 insertions, 8 deletions
diff --git a/Master/common.sh b/Master/common.sh
index afedda3642b..d069c5c6cf4 100755
--- a/Master/common.sh
+++ b/Master/common.sh
@@ -340,8 +340,7 @@ TEXMFCNF__fix_texmf()
rm .sed_tmp.$$
#
# the TEXMFHOME tree
- if test "x$HOME_CHANGE" = "x1"; then
-
+ if test "x$TEXMFHOME" != '$HOME/texmf'; then
# if the variable starts with the explicit home of the current user
# (as in "/u/karl") replace that with the string '$HOME' as the
# explicit home of the current user is unlikely to ever be right.
@@ -708,7 +707,6 @@ menu_directories()
TEXMFSYSVAR=`dirname "$TEXMFSYSVAR/x" | sed 's@//*@/@g'`
;;
4) gets TEXMFHOME
- HOME_CHANGE=1
TEXMFHOME=`dirname "$TEXMFHOME/x" | sed 's@//*@/@g'` ;;
R) return;;
Q) exit_on_confirm;;
@@ -1022,7 +1020,6 @@ init()
TEXMFHOME=${TEXLIVE_INSTALL_TEXMFHOME-'$HOME/texmf'}
VAR_CHANGE=""
LOCAL_CHANGE=""
- HOME_CHANGE=""
screen_1=' ===================> TeX Live installation procedure <==================
diff --git a/Master/install-live.sh b/Master/install-live.sh
index 4b13d38934b..1da050e83d8 100755
--- a/Master/install-live.sh
+++ b/Master/install-live.sh
@@ -162,22 +162,19 @@ test -z "$TEXMFSYSVAR" || chmod -R a+w $TEXMFSYSVAR ||
warn "command 'chmod -R a+w $TEXMFSYSVAR' failed"
TEXMFCNF__fix_fmtutil
make_local_skeleton
- $bindir/updmap --nohash --cnffile $TEXMFSYSVAR/web2c/updmap.cfg --dvipsoutputdir=$TEXMFSYSVAR/fonts/map/dvips/updmap --dvipdfmoutputdir=$TEXMFSYSVAR/fonts/map/dvipdfm/updmap --pdftexoutputdir=$TEXMFSYSVAR/fonts/map/pdftex/updmap
+ $bindir/updmap --nohash --quiet --cnffile $TEXMFSYSVAR/web2c/updmap.cfg --dvipsoutputdir=$TEXMFSYSVAR/fonts/map/dvips/updmap --dvipdfmoutputdir=$TEXMFSYSVAR/fonts/map/dvipdfm/updmap --pdftexoutputdir=$TEXMFSYSVAR/fonts/map/pdftex/updmap
$have_system && $bindir/mktexlsr
cat <<ENDC
- Now you are finished.
For future configuration, edit files in $TEXMFSYSVAR
You should now add these setup statements to your environment,
depending on what shell is running,
For csh (~/.cshrc):
-
setenv TEXMFSYSVAR $TEXMFSYSVAR
setenv PATH $TEXDIR/bin/$pd:\$PATH
For bash (~/.bash_profile) or sh (~/.profile):
-
TEXMFSYSVAR=$TEXMFSYSVAR
PATH=$TEXDIR/bin/$pd:\$PATH
export PATH TEXMFSYSVAR