[arch-commits] Commit in (2 files)
Rémy Oudompheng
remy at archlinux.org
Sun Jan 9 08:49:03 UTC 2011
Date: Sunday, January 9, 2011 @ 03:49:02
Author: remy
Revision: 105466
texlive: rework install files to not duplicate contents of the maps file.
Modified:
texlive-core/trunk/texlive.install
texlive-fontsextra/trunk/texlive.install
------------------------------------------+
texlive-core/trunk/texlive.install | 108 ++++++--------------
texlive-fontsextra/trunk/texlive.install | 155 ++++++-----------------------
2 files changed, 68 insertions(+), 195 deletions(-)
Modified: texlive-core/trunk/texlive.install
===================================================================
--- texlive-core/trunk/texlive.install 2011-01-09 08:46:36 UTC (rev 105465)
+++ texlive-core/trunk/texlive.install 2011-01-09 08:49:02 UTC (rev 105466)
@@ -1,66 +1,19 @@
PKGNAME="texlive-core"
-UPDMAP="/etc/texmf/web2c/updmap.cfg"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
SYNCWITHTREES=''
-NEWMAPS=`mktemp`
-cat <<EOF > $NEWMAPS
-Map euler.map
-Map charter.map
-Map fpls.map
-Map l7x-urwvn.map
-Map lm.map
-Map marvosym.map
-Map pazo.map
-Map pxfonts.map
-Map qag.map
-Map qbk.map
-Map qcr.map
-Map qcs.map
-Map qhv.map
-Map qpl.map
-Map qtm.map
-Map qzc.map
-Map tabvar.map
-Map txfonts.map
-Map utopia.map
-Map zpeu.map
-MixedMap ccpl.map
-MixedMap cm-super-t1.map
-MixedMap cm-super-t2a.map
-MixedMap cm-super-t2b.map
-MixedMap cm-super-t2c.map
-MixedMap cm-super-ts1.map
-MixedMap cm-super-x2.map
-MixedMap cm.map
-MixedMap cmextra.map
-MixedMap cmtext-bsr-interpolated.map
-MixedMap csother.map
-MixedMap cstext.map
-MixedMap cyrillic.map
-MixedMap eurosym.map
-MixedMap latxfont.map
-MixedMap mflogo.map
-MixedMap plother.map
-MixedMap pltext.map
-MixedMap rsfs.map
-MixedMap stmaryrd.map
-MixedMap symbols.map
-MixedMap tipa.map
-MixedMap wasy.map
-MixedMap yhmath.map
-EOF
+OLDMAPSSAVE=`mktemp`
+NEWMAPS="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-pre_install() {
- cat $NEWMAPS >> $UPDMAP
-}
-
post_install() {
- echo ">>> texlive: updating the filename database..."
- /usr/bin/mktexlsr
- echo ">>> texlive: updating the fontmap files with updmap..."
- /usr/bin/updmap-sys --quiet --nohash
- echo " done."
+ echo ">>> texlive: updating updmap.cfg with new map files..."
+ cat "$NEWMAPS" >> $UPDMAP
+ echo ">>> texlive: updating the filename database..."
+ usr/bin/mktexlsr
+ echo ">>> texlive: updating the fontmap files with updmap..."
+ usr/bin/updmap-sys --quiet --nohash
+ echo " done."
echo -n "creating all formats..."
- /usr/bin/fmtutil-sys --all 1>/dev/null
+ usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
echo "NB: To setup ConTeXt and the lua(la)tex font db,"
@@ -69,19 +22,30 @@
pre_upgrade() {
if [[ "$2" == 200* ]]; then
- OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+ OLDMAPS="usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
echo "Info: copying previous updmap.cfg from /usr/share/texmf-config/web2c/"
echo " to /etc/texmf/web2c/ (and keeping new one as updmap.cfg.pacnew)"
- mv /etc/texmf/web2c/updmap.cfg /etc/texmf/web2c/updmap.cfg.pacnew
- cp /usr/share/texmf-config/web2c/updmap.cfg.pacsave /etc/texmf/web2c/updmap.cfg
+ mv etc/texmf/web2c/updmap.cfg /etc/texmf/web2c/updmap.cfg.pacnew
+ cp usr/share/texmf-config/web2c/updmap.cfg.pacsave etc/texmf/web2c/updmap.cfg
else
# $2 >= 2010
- OLDMAPS="/var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+ OLDMAPS="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
fi
if [ -f $OLDMAPS ] ; then
+ # temporarily saving old maps file
+ cp "$OLDMAPS" "$OLDMAPSSAVE"
+ else
+ echo "Warning: file $OLDMAPS not found"
+ SYNCWITHTREES="--syncwithtrees"
+ fi
+}
+
+post_upgrade() {
+ echo ">>> texlive: updating updmap.cfg with new map files..."
+ if [ -f "$OLDMAPSSAVE" ] ; then
MAPSDIFF=`mktemp`
TOADD=`mktemp`
- diff -B -w $OLDMAPS $NEWMAPS | sed 's/\s\+/ /g' > $MAPSDIFF
+ diff -B -w $OLDMAPSSAVE $NEWMAPS | sed 's/\s\+/ /g' > $MAPSDIFF
TOREMOVE=`cat $MAPSDIFF | egrep '^<' | cut -d' ' -f3`
cat $MAPSDIFF | egrep '^>' | sed 's/^> //' > $TOADD
if [ "x$TOREMOVE" != "x" ]; then
@@ -92,20 +56,14 @@
if [ -s $TOADD ]; then
cat $TOADD >> $UPDMAP
fi
- else
- echo "Warning: file $OLDMAPS not found"
- SYNCWITHTREES="--syncwithtrees"
fi
-}
-
-post_upgrade() {
- echo ">>> texlive: updating the filename database..."
- /usr/bin/mktexlsr
- echo ">>> texlive: updating the fontmap files with updmap..."
- /usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
- echo " done."
+ echo ">>> texlive: updating the filename database..."
+ usr/bin/mktexlsr
+ echo ">>> texlive: updating the fontmap files with updmap..."
+ usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+ echo " done."
echo ">>> texlive: recreating all formats..."
- /usr/bin/fmtutil-sys --all 1>/dev/null
+ usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
echo "NB: To setup ConTeXt and the lua(la)tex font db,"
Modified: texlive-fontsextra/trunk/texlive.install
===================================================================
--- texlive-fontsextra/trunk/texlive.install 2011-01-09 08:46:36 UTC (rev 105465)
+++ texlive-fontsextra/trunk/texlive.install 2011-01-09 08:49:02 UTC (rev 105466)
@@ -1,123 +1,42 @@
PKGNAME="texlive-fontsextra"
-UPDMAP="/etc/texmf/web2c/updmap.cfg"
+UPDMAP="etc/texmf/web2c/updmap.cfg"
SYNCWITHTREES=''
-NEWMAPS=`mktemp`
-cat <<EOF > $NEWMAPS
-Map Acorn.map
-Map AnnSton.map
-Map ArtNouv.map
-Map ArtNouvc.map
-Map Carrickc.map
-Map Eichenla.map
-Map Eileen.map
-Map EileenBl.map
-Map Elzevier.map
-Map GotIn.map
-Map GoudyIn.map
-Map Kinigcap.map
-Map Konanur.map
-Map Kramer.map
-Map MnSymbol.map
-Map MorrisIn.map
-Map Nouveaud.map
-Map OrnementsADF.map
-Map Romantik.map
-Map Rothdn.map
-Map RoyalIn.map
-Map Sanremo.map
-Map Starburst.map
-Map Typocaps.map
-Map Zallman.map
-Map antt.map
-Map ap.map
-Map archaicprw.map
-Map arev.map
-Map ascii.map
-Map augie.map
-Map auncial.map
-Map aurical.map
-Map belleek.map
-Map bera.map
-Map ccicons.map
-Map clm.map
-Map cm-lgc.map
-Map cmin.map
-Map cyklop.map
-Map dictsym.map
-Map dstroke.map
-Map epigrafica.map
-Map esvect.map
-Map fge.map
-Map fi4.map
-Map foekfont.map
-Map fonetika.map
-Map fourier-utopia-expert.map
-Map fourier.map
-Map gfsartemisia.map
-Map gfsbodoni.map
-Map gfscomplutum.map
-Map gfsdidot.map
-Map gfsneohellenic.map
-Map gfssolomos.map
-Map gptimes.map
-Map icelandic.map
-Map iwona.map
-Map kpfonts.map
-Map kurier.map
-Map libertine.map
-Map linearA.map
-Map mdbch.map
-Map mdput.map
-Map mdugm.map
-Map pbsi.map
-Map phaistos.map
-Map recycle.map
-Map slantcm.map
-Map troff-updmap.map
-Map uaq.map
-Map ugq.map
-Map ybv.map
-Map yes.map
-Map yfrak.map
-Map yly.map
-Map yrd.map
-Map yv1.map
-Map yv2.map
-Map yv3.map
-Map yvo.map
-Map yvt.map
-MixedMap allrunes.map
-MixedMap cmll.map
-MixedMap hfbright.map
-MixedMap lxfonts.map
-MixedMap pigpen.map
-MixedMap semaf.map
-MixedMap trajan.map
-EOF
+OLDMAPSSAVE=`mktemp`
+NEWMAPS="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
-pre_install() {
- cat $NEWMAPS >> $UPDMAP
-}
-
post_install() {
- echo ">>> texlive: updating the filename database..."
- /usr/bin/mktexlsr
- echo ">>> texlive: updating the fontmap files with updmap..."
- /usr/bin/updmap-sys --quiet --nohash
- echo " done."
+ echo ">>> texlive: updating updmap.cfg with new map files..."
+ cat "$NEWMAPS" >> $UPDMA
+ echo ">>> texlive: updating the filename database..."
+ usr/bin/mktexlsr
+ echo ">>> texlive: updating the fontmap files with updmap..."
+ usr/bin/updmap-sys --quiet --nohash
+ echo " done."
}
pre_upgrade() {
if [[ "$2" == 200* ]]; then
- OLDMAPS="/usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
+ OLDMAPS="usr/share/texmf-var/arch/installedpkgs/$PKGNAME.maps"
else # >= 2010
- OLDMAPS="/var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
+ OLDMAPS="var/lib/texmf/arch/installedpkgs/$PKGNAME.maps"
fi
if [ -f $OLDMAPS ] ; then
+ # temporarily saving old maps file
+ cp "$OLDMAPS" "$OLDMAPSSAVE"
+ else
+ echo "Warning: file $OLDMAPS not found"
+ echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
+ SYNCWITHTREES="--syncwithtrees"
+ fi
+}
+
+post_upgrade() {
+ echo ">>> texlive: updating updmap.cfg with new map files..."
+ if [ -f "$OLDMAPSSAVE" ] ; then
MAPSDIFF=`mktemp`
TOADD=`mktemp`
- diff -B $OLDMAPS $NEWMAPS | sed 's/\s\+/ /g' > $MAPSDIFF
+ diff -B $OLDMAPSSAVE $NEWMAPS | sed 's/\s\+/ /g' > $MAPSDIFF
TOREMOVE=`cat $MAPSDIFF | egrep '^<' | cut -d' ' -f3`
cat $MAPSDIFF | egrep '^>' | sed 's/^> //' > $TOADD
if [ "x$TOREMOVE" != "x" ]; then
@@ -128,22 +47,14 @@
if [ -s $TOADD ]; then
cat $TOADD >> $UPDMAP
fi
- else
- echo "Warning: file $OLDMAPS not found"
- echo "(ignore the above if updating from TL2008 or from TL2009 in testing)"
- SYNCWITHTREES="--syncwithtrees"
fi
+ echo ">>> texlive: updating the filename database..."
+ usr/bin/mktexlsr
+ echo ">>> texlive: updating the fontmap files with updmap..."
+ usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
+ echo " done."
}
-
-post_upgrade() {
- echo ">>> texlive: updating the filename database..."
- /usr/bin/mktexlsr
- echo ">>> texlive: updating the fontmap files with updmap..."
- /usr/bin/updmap-sys --quiet --nohash $SYNCWITHTREES
- echo " done."
-}
-
pre_remove() {
for m in `cut -d' ' -f2 $NEWMAPS`; do
sed -i "/\s$m/d" $UPDMAP ;
@@ -151,5 +62,9 @@
}
post_remove() {
- post_install
+ echo ">>> texlive: updating the filename database..."
+ usr/bin/mktexlsr
+ echo ">>> texlive: updating the fontmap files with updmap..."
+ usr/bin/updmap-sys --quiet --nohash
+ echo " done."
}
More information about the arch-commits
mailing list