[subversion-commit] SVN tex-common commit + diffs: r905 - tex-common/trunk/scripts

[Florent Rougon]

Author: frn
Date: 2006-02-19 16:44:28 +0000 (Sun, 19 Feb 2006)
New Revision: 905

Modified:
   tex-common/trunk/scripts/postinst-tex
   tex-common/trunk/scripts/postrm-tex
Log:
* Fix improper use of "return" in dhit_libkpathsea_configured()

* Again move the update-* calls out of the dhit_libkpathsea_configured
  check, since that will create more up-to-date updmap.cfg, fmtutil.cnf and
  language.dat files in some cases.



Modified: tex-common/trunk/scripts/postinst-tex
===================================================================
--- tex-common/trunk/scripts/postinst-tex	2006-02-19 15:20:45 UTC (rev 904)
+++ tex-common/trunk/scripts/postinst-tex	2006-02-19 16:44:28 UTC (rev 905)
@@ -19,7 +19,7 @@
 #   2. libkpathsea is configured.
 dhit_libkpathsea_configured ()
 {
-    return kpsewhich --version >/dev/null 2>&1
+    kpsewhich --version >/dev/null 2>&1
 }
 
 dhit_update_lsr_files ()
@@ -96,14 +96,14 @@
 
 case "$1" in
     configure|abort-upgrade|abort-remove|abort-deconfigure)
+        # It doesn't hurt to call all of them.
+        # These programs are all in tex-common and can be run immediately.
+        update-updmap --quiet
+        update-language
+        update-fmtutil
         # All of the following needs an installed and configured
         # basic TeX system, so check this.
         if dhit_libkpathsea_configured; then
-            # It doesn't hurt to call all of them.
-            # These programs are all in tex-common and can be run immediately.
-            update-updmap --quiet
-            update-language
-            update-fmtutil
             # mktexlsr may not be present
             if which mktexlsr >/dev/null; then
                 dhit_update_lsr_files

Modified: tex-common/trunk/scripts/postrm-tex
===================================================================
--- tex-common/trunk/scripts/postrm-tex	2006-02-19 15:20:45 UTC (rev 904)
+++ tex-common/trunk/scripts/postrm-tex	2006-02-19 16:44:28 UTC (rev 905)
@@ -19,7 +19,7 @@
 #   2. libkpathsea is configured.
 dhit_libkpathsea_configured ()
 {
-    return kpsewhich --version >/dev/null 2>&1
+    kpsewhich --version >/dev/null 2>&1
 }
 
 dhit_check_run_without_errors ()
@@ -80,13 +80,13 @@
 
 case "$1" in
     remove|disappear)
-        # The following needs an installed and configured basic TeX system, so
-        # check this.
+        # It doesn't hurt to call all of them.
+        dhit_check_run_without_errors update-updmap --quiet
+        dhit_check_run_without_errors update-language
+        dhit_check_run_without_errors update-fmtutil
+        # The mktexlsr call needs an installed and configured basic TeX
+        # system, so check this.
         if dhit_libkpathsea_configured; then
-            # It doesn't hurt to call all of them.
-            dhit_check_run_without_errors update-updmap --quiet
-            dhit_check_run_without_errors update-language
-            dhit_check_run_without_errors update-fmtutil
             dhit_check_run_without_errors mktexlsr
         fi
         for i in #WHATTODO# ; do