From 982e8935d2259eacf196e2b8d3364d0286e953ca Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Wed, 5 Jan 2005 00:09:57 +0000
Subject: r1737: releasing version 4.2.30

---
 autoscripts/postinst-init           | 2 +-
 autoscripts/postinst-menu           | 4 +++-
 autoscripts/postinst-menu-method    | 2 +-
 autoscripts/postinst-mime           | 4 +++-
 autoscripts/postinst-sharedmimeinfo | 3 +++
 autoscripts/postrm-sharedmimeinfo   | 3 +++
 autoscripts/postrm-xfonts           | 2 +-
 autoscripts/prerm-init              | 2 +-
 autoscripts/prerm-init-norestart    | 2 +-
 9 files changed, 17 insertions(+), 7 deletions(-)
 create mode 100644 autoscripts/postinst-sharedmimeinfo
 create mode 100644 autoscripts/postrm-sharedmimeinfo

(limited to 'autoscripts')

diff --git a/autoscripts/postinst-init b/autoscripts/postinst-init
index 8128cd96..6a1c5727 100644
--- a/autoscripts/postinst-init
+++ b/autoscripts/postinst-init
@@ -1,6 +1,6 @@
 if [ -x "/etc/init.d/#SCRIPT#" ]; then
 	update-rc.d #SCRIPT# #INITPARMS# >/dev/null
-	if [ -x /usr/sbin/invoke-rc.d ]; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
 	else
 		/etc/init.d/#SCRIPT# start || #ERROR_HANDLER#
diff --git a/autoscripts/postinst-menu b/autoscripts/postinst-menu
index 276a3c0a..b56a3462 100644
--- a/autoscripts/postinst-menu
+++ b/autoscripts/postinst-menu
@@ -1 +1,3 @@
-if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ; fi
+if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
+	update-menus
+fi
diff --git a/autoscripts/postinst-menu-method b/autoscripts/postinst-menu-method
index d3ef6362..c56d6258 100644
--- a/autoscripts/postinst-menu-method
+++ b/autoscripts/postinst-menu-method
@@ -1,7 +1,7 @@
 inst=/etc/menu-methods/#PACKAGE#
 if [ -f $inst ]; then
 	chmod a+x $inst
-	if [ -x /usr/bin/update-menus ]; then
+	if [ -x "`which update-menus 2>/dev/null`" ]; then
 		update-menus
 	fi
 fi
diff --git a/autoscripts/postinst-mime b/autoscripts/postinst-mime
index bef63cc9..3749fc9d 100644
--- a/autoscripts/postinst-mime
+++ b/autoscripts/postinst-mime
@@ -1 +1,3 @@
-if [ "$1" = "configure" ] && [ -x /usr/sbin/update-mime ]; then update-mime; fi
+if [ "$1" = "configure" ] && [ -x "`which update-mime 2>/dev/null`" ]; then
+	update-mime
+fi
diff --git a/autoscripts/postinst-sharedmimeinfo b/autoscripts/postinst-sharedmimeinfo
new file mode 100644
index 00000000..aa6333fb
--- /dev/null
+++ b/autoscripts/postinst-sharedmimeinfo
@@ -0,0 +1,3 @@
+if [ "$1" = "configure" ] && [ -x "`which update-mime-database 2>/dev/null`" ]; then
+	update-mime-database /usr/share/mime
+fi
diff --git a/autoscripts/postrm-sharedmimeinfo b/autoscripts/postrm-sharedmimeinfo
new file mode 100644
index 00000000..917fd49a
--- /dev/null
+++ b/autoscripts/postrm-sharedmimeinfo
@@ -0,0 +1,3 @@
+if [ -x "`which update-mime-database 2>/dev/null`" ]; then
+	update-mime-database /usr/share/mime
+fi
diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
index a4d0a082..42fea687 100644
--- a/autoscripts/postrm-xfonts
+++ b/autoscripts/postrm-xfonts
@@ -1,3 +1,3 @@
-if [ "$1" != "upgrade" ] && [ -x /usr/sbin/update-fonts-dir ]; then
+if [ "$1" != "upgrade" ] && [ -x "`which update-fonts-dir 2>/dev/null`" ]; then
 #CMDS#
 fi
diff --git a/autoscripts/prerm-init b/autoscripts/prerm-init
index 014fa9a0..96d37558 100644
--- a/autoscripts/prerm-init
+++ b/autoscripts/prerm-init
@@ -1,5 +1,5 @@
 if [ -x "/etc/init.d/#SCRIPT#" ]; then
-	if [ -x /usr/sbin/invoke-rc.d ] ; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
 	else
 		/etc/init.d/#SCRIPT# stop || #ERROR_HANDLER#
diff --git a/autoscripts/prerm-init-norestart b/autoscripts/prerm-init-norestart
index 0f64c45e..9b631748 100644
--- a/autoscripts/prerm-init-norestart
+++ b/autoscripts/prerm-init-norestart
@@ -1,5 +1,5 @@
 if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then
-	if [ -x /usr/sbin/invoke-rc.d ] ; then
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
 		invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
 	else
 		/etc/init.d/#SCRIPT# stop || #ERROR_HANDLER#
-- 
cgit v1.2.3