[subversion-commit] SVN tex-common commit + diffs: r892 - tex-common/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-02-16 16:17:37 +0000 (Thu, 16 Feb 2006)
New Revision: 892

Modified:
   tex-common/trunk/debian/config.in
   tex-common/trunk/debian/postinst.in
   tex-common/trunk/debian/variables
Log:
[postinst.in] use different variable names for /var/lib/texmf as a texmf.cnf
              variable and as a maintainer script variable
[postinst.in,config.in,variables]: use eperl variable for directory 
	      permissions, to make sure postinst and config are consistent

Modified: tex-common/trunk/debian/config.in
===================================================================
--- tex-common/trunk/debian/config.in	2006-02-16 16:16:18 UTC (rev 891)
+++ tex-common/trunk/debian/config.in	2006-02-16 16:17:37 UTC (rev 892)
@@ -9,7 +9,11 @@
 action=$1
 installed_version=$2
 
+# common variables
+FONTCACHE_PERMS=<:=$FONTCACHE_PERMS:>
 
+
+
 . <:=${CONFMODULE}:>
 db_version 2.0
 
@@ -52,8 +56,8 @@
 
   # check wether the directory /var/cache/fonts is group writeable and
   # for which group
-  PERMS=$(stat --format="%a" /var/cache/fonts)
-  GROUP=$(stat --format="%G" /var/cache/fonts)
+  PERMS=$(stat --format="%a" /var/cache/fonts 2>/dev/null)
+  GROUP=$(stat --format="%G" /var/cache/fonts 2>/dev/null)
 
   # see wether we already have asked this question once
   db_fget tex-common/managecache seen || true
@@ -61,8 +65,8 @@
 
   if [ $SEEN = true ] ; then
     # this question was already shown
-    # if the permissions are still 3775 we set managecache to true
-    if [ $PERMS = 3775 ] ; then
+    # if the permissions are still <:=$FONTCACHE_PERMS:> we set managecache to true
+    if [ $PERMS = $FONTCACHE_PERMS ] ; then
       db_set tex-common/managecache true || true
       db_set tex-common/groupname "$GROUP" || true
     else
@@ -70,11 +74,13 @@
     fi
   else
     # this question has not been seen, so if the permissions are 
-    # - either the new permissions 3775 as we want to ship them
+    # - either the permissions as shipped in the deb
+    # - or empty, because the file is not yet present
+    # - or the new permissions <:=$FONTCACHE_PERMS:> as we want to ship them
     # - or the permissions as shipped by old tetex versions
     # then set the managecache to true, otherwise to false
-    # we will later change it to 3775 in the true case
-    if [ $PERMS = 3775 ] || [ $PERMS = 1777 ] ; then
+    # we will later change it to <:=$FONTCACHE_PERMS:> in the true case
+    if [ "$PERMS" = 755 ] || [ -z "$PERMS" ] || [ "$PERMS" = $FONTCACHE_PERMS ] || [ "$PERMS" = 1777 ]; then
       db_set tex-common/managecache true || true
     else
       db_set tex-common/managecache false || true

Modified: tex-common/trunk/debian/postinst.in
===================================================================
--- tex-common/trunk/debian/postinst.in	2006-02-16 16:16:18 UTC (rev 891)
+++ tex-common/trunk/debian/postinst.in	2006-02-16 16:17:37 UTC (rev 892)
@@ -8,7 +8,7 @@
 ## Define static variables we need
 MKTMPDIR=<:=$MKTMPDIR:> # mktemp will create its files there
 UCF_FILES="<:=$TEX_COMMON_UCF_FILES:>"
-TEXMFSYSVAR="<:=$TEXMFSYSVAR:>"
+TEXMFSYSVARDIR="<:=$TEXMFSYSVARDIR:>"
 UCF="ucf --debconf-ok"
 #UCF="ucf -d --debconf-ok --verbose"
 OLD_LDAT=/etc/texmf/language.dat
@@ -18,7 +18,9 @@
 .:
 ls-R
 '
+FONTCACHE_PERMS=<:=$FONTCACHE_PERMS:>
 
+
 umask 022
 
 # Give a name to the first commandline argument
@@ -124,7 +126,7 @@
       db_get tex-common/groupname || true
       GROUP="$RET"
       if [ -n "$GROUP" ] ; then
-        find /var/cache/fonts -type d -print0 | xargs -0r chmod 03755
+        find /var/cache/fonts -type d -print0 | xargs -0r chmod $FONTCACHE_PERMS
 	find /var/cache/fonts -type d -print0 | xargs -0r chown "root:$GROUP"
       fi
     fi

Modified: tex-common/trunk/debian/variables
===================================================================
--- tex-common/trunk/debian/variables	2006-02-16 16:16:18 UTC (rev 891)
+++ tex-common/trunk/debian/variables	2006-02-16 16:17:37 UTC (rev 892)
@@ -1,7 +1,8 @@
 <:# Copyright (C) 2004 by Frank Küster <frank at kuesterei.ch>.:>//
-<:# $Id: variables,v 1.2 2005/06/28 16:32:32 frank Exp $:>//
+<:# $Id$:>//
 <:use File::Basename:>//
 <:$PACKAGE="tex-common":>//
+<:$FONTCACHE_PERMS="3775":>//
 #include "common.variables"
 <:
 # Local variables: