diff options
-rwxr-xr-x | Master/common.sh | 42 |
1 files changed, 25 insertions, 17 deletions
diff --git a/Master/common.sh b/Master/common.sh index bd872b78992..a3b80ed2a9f 100755 --- a/Master/common.sh +++ b/Master/common.sh @@ -1279,6 +1279,7 @@ OAF } +# emacs-page # at the end of the end ... this routine does not return. # common_end_install() @@ -1350,7 +1351,7 @@ common_end_install() if $skip_systemstuff; then echo Since $TEXMFCNF_DIR/texmf.cnf already existed, - echo we have not touched modified anything in that directory. + echo we have not modified anything in that directory. echo Please review your setup. fi exit @@ -1362,9 +1363,10 @@ common_end_install() post_install_jobs () { $debug && echo "debug:do post_install_jobs " >&2 - for j in `sort -u $work_dir/*.jobs` - do + for j in `sort -u $work_dir/*.jobs`; do command=`echo $j | sed 's/.\(.*\)=.*/\1/'` + test "x$command" = xBuildFormat && continue # we do nothing with these + parameter=`echo $j | sed 's/.*=\(.*\)/\1/'` echo " EXECUTE $j: $command on $parameter" >&2 case $command in @@ -1375,8 +1377,8 @@ post_install_jobs () addDvipsMap) echo "p +$parameter" >> $TEXMFSYSVAR/dvips/config/config.ps;; addDvipdfmMap) - test -f $TEXMFSYSVAR/dvipdfm/config/config && echo "f $parameter" >> $TEXMFSYSVAR/dvipdfm/config/config; - ;; + test -f $TEXMFSYSVAR/dvipdfm/config/config && echo "f $parameter" >> $TEXMFSYSVAR/dvipdfm/config/config;; + BuildLanguageDat) ;; # handle differently, in runsetup esac done } @@ -1386,20 +1388,24 @@ done # runsetup() { - PATH=$bindir:/bin:/usr/bin - export PATH - if test -f $TEXMFSYSVAR/tex/generic/config/language.dat - then - echo Using language.dat from TeX Live distribution. >&2 + PATH=$bindir:/bin:/usr/bin; export PATH + + # We do not do anything with the BuildLanguageDat TPM:Execute instruction. + # We just use whatever lang.dat files got installed. + texmf_langdir=$TEXDIR/texmf/tex/generic/config + sysvar_langdir=$TEXMFSYSVAR/tex/generic/config + sysvar_langdat=$sysvar_langdir/language.dat + # + if test -f $sysvar_langdat; then + echo "Using language.dat from TeX Live ($sysvar_langdat)." >&2 else - echo Making language.dat in $TEXMFSYSVAR/tex/generic/config >&2 + echo Making language.dat in $sysvar_langdir >&2 echo " from your language selections..." >&2 - # if lang.dat's installed (basic scheme), don't mention missing files. - langsel=$TEXDIR/texmf/tex/generic/config/language.*.dat + # if no lang.dat's installed (basic scheme), don't mention missing files. + langsel=$texmf_langdir/language.*.dat test -n "`ls $langsel 2>/dev/null`" || langsel= - mkdirhier $TEXMFSYSVAR/tex/generic/config - cat $TEXDIR/texmf/tex/generic/config/language.us $langsel \ - >$TEXMFSYSVAR/tex/generic/config/language.dat + mkdirhier $sysvar_langdir + cat $texmf_langdir/language.us $langsel >$sysvar_langdat fi # Update ls-R before running texconfig, or modes.mf et al. may not be found. @@ -1424,8 +1430,10 @@ runsetup() ========================= Installation is finished. (`date`) +Formats will be built for each user as needed. If you wish to install +all formats at once, for everyone on your system, run fmtutil-sys --all. + For future global configuration, edit files in $TEXMFSYSVAR (or run texconfig or texconfig-sys). - ENDC } |