diff --git a/texlive-filesystem.changes b/texlive-filesystem.changes index 13db554..5bc8911 100644 --- a/texlive-filesystem.changes +++ b/texlive-filesystem.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 11 15:18:34 UTC 2012 - werner@suse.de + +- Fix update script: do not override with wrong md5 check sum for + language format check +- Run updmap-sys only if required + ------------------------------------------------------------------- Thu Aug 2 13:17:40 UTC 2012 - werner@suse.de diff --git a/update.texlive b/update.texlive index cf7b6c0..3546830 100644 --- a/update.texlive +++ b/update.texlive @@ -175,8 +175,8 @@ for run in /var/run/texlive/run-fmtutil* ; do language) test -n "${cnf_ldat}" -a -n "${cnf_ldef}" || continue set -- $(md5sum < ${cnf_ldat}) - set -- $(md5sum < ${cnf_ldef}) echo $1 > ${md5_ldat} + set -- $(md5sum < ${cnf_ldef}) echo $1 > ${md5_ldef} test $VERBOSE = true && echo -en "\r[ ]Handle language.dat setups." fmtutil-sys --byhyphen ${cnf_ldat} < /dev/null 1>&4 2>&4 @@ -196,6 +196,7 @@ for run in /var/run/texlive/run-fmtutil* ; do esac rm -f /var/run/texlive/run-fmtutil* done + for run in /var/run/texlive/run-updmap* ; do if test -e $run ; then type -p updmap-sys &> /dev/null || { echo "${0##*/}: No updmap-sys in PATH ... skipping" 1>&2; break; } @@ -212,15 +213,17 @@ for run in /var/run/texlive/run-updmap* ; do test $VERBOSE = true && echo -en "\r[ ]Updating TeX font mappings." updmap-sys --nohash --nomkmap --syncwithtrees < /dev/null 1>&4 2>&4 let rc+=$? - enablemaps | \ while read line ; do + let n++ line='^#![[:space:]]*((Mixed)?Map)[[:space:]]*('$line')' emap=$(sed -n -r "s/$line/\1=\3/p" ${cfg}) updmap-sys --nohash --nomkmap --enable $emap < /dev/null 1>&4 2>&4 let rc+=$? - done - updmap-sys < /dev/null 1>&4 2>&4 - let rc+=$? + done < <(enablemaps) + if ((n > 0)) ; then + updmap-sys < /dev/null 1>&4 2>&4 + let rc+=$? + fi test $VERBOSE = true && echo fi fi