diff --git a/texlive-filesystem.changes b/texlive-filesystem.changes index 6d579c8..6d4f756 100644 --- a/texlive-filesystem.changes +++ b/texlive-filesystem.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 13 09:13:34 UTC 2021 - Dr. Werner Fink + +- Simplify update script, that is always hash before updating + font maps + ------------------------------------------------------------------- Mon Apr 12 15:00:05 UTC 2021 - Dr. Werner Fink diff --git a/update.texlive b/update.texlive index 1159d32..6d04a33 100644 --- a/update.texlive +++ b/update.texlive @@ -552,17 +552,14 @@ for run in /var/run/texlive/run-updmap* ; do ;; esac done < $run + mktexlsr < /dev/null 1>&4 2>&4 + let rc+=$? updmap-sys --cnffile $cnf_umap --nohash --syncwithtrees < /dev/null 1>&4 2>&4 let rc+=$? enablemaps $cnf_umap < /dev/null 1>&4 2>&4 let rc+=$? - if test -e /var/run/texlive/run-mktexlsr ; then - updmap-sys --cnffile $cnf_umap < /dev/null 1>&4 2>&4 - let rc+=$? - else - updmap-sys --cnffile $cnf_umap --nohash < /dev/null 1>&4 2>&4 - let rc+=$? - fi + updmap-sys --cnffile $cnf_umap --nohash < /dev/null 1>&4 2>&4 + let rc+=$? ((rc == 0)) || continue rm -f /var/run/texlive/run-updmap* rm -f /var/run/texlive/sync-updmap* @@ -575,18 +572,13 @@ for run in /var/run/texlive/sync-updmap* ; do type -p updmap-sys &> /dev/null || break test -e "$cnf_umap" || break test $VERBOSE = true && { echo -en "\r[ ]Updating TeX font mappings."; let nl++; } + mktexlsr < /dev/null 1>&4 2>&4 + let rc+=$? updmap-sys --cnffile $cnf_umap --nohash --syncwithtrees < /dev/null 1>&4 2>&4 let rc+=$? enablemaps $cnf_umap < /dev/null 1>&4 2>&4 + updmap-sys --cnffile $cnf_umap --nohash < /dev/null 1>&4 2>&4 let rc+=$? - if test -e /var/run/texlive/run-mktexlsr ; then - updmap-sys --cnffile $cnf_umap < /dev/null 1>&4 2>&4 - let rc+=$? - rm -f /var/run/texlive/run-mktexlsr* - else - updmap-sys --cnffile $cnf_umap --nohash < /dev/null 1>&4 2>&4 - let rc+=$? - fi ((rc == 0)) || continue rm -f /var/run/texlive/sync-updmap* rm -f /var/run/texlive/run-mktexlsr*