[Debian-tex-commits] SVN tex-common commit + diffs: r2966 - in tex-common/trunk: debian scripts

[Frank Küster]

Author: frank
Date: 2007-06-19 09:29:29 +0000 (Tue, 19 Jun 2007)
New Revision: 2966

Modified:
   tex-common/trunk/debian/changelog
   tex-common/trunk/scripts/debianize-updmap
   tex-common/trunk/scripts/update-fontlang
Log:
  * let update-fontlang and debianize-updmap create TEXMFCONFIG if  it
    doesn't exist yet (at least when there's only one directory in that
    variable) [fk].


Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2007-06-18 09:00:51 UTC (rev 2965)
+++ tex-common/trunk/debian/changelog	2007-06-19 09:29:29 UTC (rev 2966)
@@ -1,9 +1,12 @@
 tex-common (1.9~1) unstable; urgency=low
 
   * Make sure that update-fontlang detects TEXMFVAR properly even if the
-    directory does not yet exist (closes: #428448)
+    directory does not yet exist (closes: #428448) [fk].
+  * let update-fontlang and debianize-updmap create TEXMFCONFIG if  it
+    doesn't exist yet (at least when there's only one directory in that
+    variable) [fk].
 
- -- Frank Küster <frank at debian.org>  Wed, 13 Jun 2007 15:33:35 +0200
+ -- Frank Küster <frank at debian.org>  Tue, 19 Jun 2007 11:32:09 +0200
 
 tex-common (1.8) unstable; urgency=medium
 

Modified: tex-common/trunk/scripts/debianize-updmap
===================================================================
--- tex-common/trunk/scripts/debianize-updmap	2007-06-18 09:00:51 UTC (rev 2965)
+++ tex-common/trunk/scripts/debianize-updmap	2007-06-19 09:29:29 UTC (rev 2966)
@@ -54,11 +54,31 @@
 FindDebianUserdir(){
 #  verboseMsg "entering FindDebianUserdir"
 
-  defaultuserdir=$HOME/.texmf-config/updmap.d
+  texmfconfig=$(kpsewhich --expand-path '$TEXMFCONFIG')
+  OLDIFS="$IFS"
+  IFS=:
+  count=0
+  for d in "$texmfconfig"; do
+    : $((count++))
+    : ${cnfdir:=$d}
+    if [ -d "$d/updmap.d" ]; then
+      defaultuserdir="$d/updmap.d"
+      break
+    fi
+  done
+  IFS="$OLDIFS"
+  # still empty?  Pick one
+  if [ -z "$defaultuserdir" ] && [ $count -eq 1 ]; then
+    defaultuserdir="$cnfdir/updmap.d"
+  else
+    echo "TEXMFCONFIG contains more than one directory, and none of them"
+    echo "already contains a updmap.d/ subdirectory."
+    echo "I don't know how to proceed here, stopping."
+    exit 1
+  fi
+
   /usr/share/texmf/web2c/mktexdir $defaultuserdir
 
-  # this should read a config item in updmap.cfg, but for now we just
-  # check whether the default exists.
   if [ -d $defaultuserdir ]; then
     echo $defaultuserdir
   fi

Modified: tex-common/trunk/scripts/update-fontlang
===================================================================
--- tex-common/trunk/scripts/update-fontlang	2007-06-18 09:00:51 UTC (rev 2965)
+++ tex-common/trunk/scripts/update-fontlang	2007-06-19 09:29:29 UTC (rev 2966)
@@ -468,14 +468,27 @@
     texmfconfig=$(kpsewhich --expand-path '$TEXMFCONFIG')
     OLDIFS="$IFS"
     IFS=:
+    count=0
     for d in "$texmfconfig"; do
+        : $((count++))
+        : ${cnfdir:=$d}
         if [ -d "$d/$CNFDIR" ]; then
             conf_dir="$d/$CNFDIR"
             break
         fi
     done
     IFS="$OLDIFS"
+    # still empty?  Pick one
+    if [ -z "$defaultuserdir" ] && [ $count -eq 1 ]; then
+      defaultuserdir="$cnfdir/updmap.d"
+    else
+      echo "TEXMFCONFIG contains more than one directory, and none of them"
+      echo "already contains a updmap.d/ subdirectory."
+      echo "I don't know how to proceed here, stopping."
+      exit 1
+    fi
 
+
     # Does $TEXMFVAR expand to a single directory?
     texmfvar=$(kpsewhich --var-value 'TEXMFVAR')
     if ! echo "$texmfvar" | grep -e '[,:]'; then