[Debian-tex-commits] SVN tex-common commit + diffs: r3379 - tex-common/branches/triggers/scripts

[Norbert Preining]

Author: preining
Date: 2008-05-19 11:30:02 +0000 (Mon, 19 May 2008)
New Revision: 3379

Modified:
   tex-common/branches/triggers/scripts/update-fontlang
Log:
revert update-fontlang change, why should we do that


Modified: tex-common/branches/triggers/scripts/update-fontlang
===================================================================
--- tex-common/branches/triggers/scripts/update-fontlang	2008-05-19 11:17:46 UTC (rev 3378)
+++ tex-common/branches/triggers/scripts/update-fontlang	2008-05-19 11:30:02 UTC (rev 3379)
@@ -4,7 +4,7 @@
 #                     from a set of files
 # Copyright (C) 2002 Atsuhito Kohda
 # Copyright (C) 2004, 2005, 2006, 2007 Florent Rougon
-# Copyright (C) 2005, 2006, 2007, 2008 Norbert Preining
+# Copyright (C) 2005, 2006 Norbert Preining
 # Copyright (C) 2007 Frank Küster
 #
 # This program is free software; you can redistribute it and/or modify
@@ -28,7 +28,6 @@
 
 if [ "$progname" = "update-language" ] ; then
     CNFDIR=language.d
-    USE_TRIGGER=1
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
     CHECKFILE="$SYSWIDE_CONFDIR/00tex.cnf"
@@ -44,7 +43,6 @@
     SHORT_DESC="Generate language.dat, the hyphenation configuration file for LaTeX"
 elif [ "$progname" = "update-updmap" ] ; then
     CNFDIR=updmap.d
-    USE_TRIGGER=1
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
     CHECKFILE="$SYSWIDE_CONFDIR/00updmap.cfg"
@@ -59,7 +57,6 @@
     SHORT_DESC="Generate an updmap configuration file"
 elif [ "$progname" = "update-fmtutil" ] ; then
     CNFDIR=fmt.d
-    USE_TRIGGER=0
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
     CHECKFILE="$SYSWIDE_CONFDIR/00tex.cnf"
@@ -91,8 +88,7 @@
       --quiet            don't write anything to the standard output during
                          normal operation
       --help             display this help message and exit
-      --version          output version information and exit
-      --trigger          do not do actual processing, call the triggers"
+      --version          output version information and exit"
 
 
 DebPkgProvidedMaps_magic_comment="^[#%] -_- DebPkgProvidedMaps -_-"
@@ -470,7 +466,7 @@
 
 # -v (verbose) is here for backward compatibility only.
 TEMP=$(getopt -o +vc:o: --longoptions \
-    conf-dir:,output-file:,check,quiet,help,version,trigger \
+    conf-dir:,output-file:,check,quiet,help,version \
     -n "$progname" -- "$@")
 
 case $? in
@@ -496,7 +492,6 @@
 quiet=1
 dochecks=0
 output_file_specified=0
-trigger=0
 
 if [ $syswide_mode = 1 ]; then
     output_file="$SYSWIDE_DEFAULT_OUTPUTFILE"
@@ -546,7 +541,6 @@
             shift 2 ;;
         --quiet) quiet=1; shift ;;
         --check) dochecks=1; shift ;;
-        --trigger)  trigger=1; shift ;;
         -v) printf "\
 ${progname}'s -v option is deprecated. The default mode of operation will
 be verbose as soon as enough packages use the --quiet option. Please update
@@ -567,8 +561,6 @@
 
 # In user-specific mode, $conf_dir is required; let's check that.
 if [ $syswide_mode = 0 ]; then
-    # we set trigger mode to 0 if we are not running as root
-    trigger=1
     if [ -z "$conf_dir" ]; then
         printf "$progname: "
         cat >&2 <<EOF
@@ -584,17 +576,6 @@
     fi
 fi
 
-if [ $USE_TRIGGER = 0 ]; then
-    # if we don't use triggers, we always work in trigger mode
-    trigger=0
-fi
-if [ $trigger = 1 ]; then
-    if type dpkg-trigger > /dev/null 2>&1 &&
-       dpkg-trigger $SYSWIDE_CONFDIR ; then
-        exit 0
-    fi
-fi
-
 if [ -z "$output_file" ]; then
     printf "$progname: "
     cat >&2 <<EOF
@@ -692,4 +673,4 @@
     fi
 fi
 
-# vim:set expandtab termencoding=iso8859-15 encoding=utf-8 fileencoding=utf-8: #
+# vim:set expandtab: #