[Debian-tex-commits] SVN tex-common commit + diffs: r2968 - tex-common/trunk/scripts

[Frank Küster]

Author: frank
Date: 2007-06-19 12:18:00 +0000 (Tue, 19 Jun 2007)
New Revision: 2968

Modified:
   tex-common/trunk/scripts/debianize-updmap
   tex-common/trunk/scripts/update-fontlang
Log:
- fix the logic in update-fontlang (no need to create the dir)
- refine debianize-updmap


Modified: tex-common/trunk/scripts/debianize-updmap
===================================================================
--- tex-common/trunk/scripts/debianize-updmap	2007-06-19 12:06:14 UTC (rev 2967)
+++ tex-common/trunk/scripts/debianize-updmap	2007-06-19 12:18:00 UTC (rev 2968)
@@ -74,7 +74,7 @@
     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
+    return
   fi
 
   /usr/share/texmf/web2c/mktexdir $defaultuserdir

Modified: tex-common/trunk/scripts/update-fontlang
===================================================================
--- tex-common/trunk/scripts/update-fontlang	2007-06-19 12:06:14 UTC (rev 2967)
+++ tex-common/trunk/scripts/update-fontlang	2007-06-19 12:18:00 UTC (rev 2968)
@@ -468,10 +468,7 @@
     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
@@ -479,12 +476,10 @@
     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."
+    if [ -z "$conf_dir" ]; then
+      echo "No fmt.d directory found in"
+      echo "$texmfconfig"
+      echo "I don't know what you want me to do, exiting."
       exit 1
     fi