summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-07-24 00:13:27 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-07-24 00:13:44 +0200
commit7d193fe6886a1cfe466d4f6998a59e224fa6e29f (patch)
tree6a7df062500acf53e30b5b983d7ec5d897660034
parent3cc0f93bba6133bba320636c0f95aa27cb8c51b6 (diff)
downloaditzks-systems-7d193fe6886a1cfe466d4f6998a59e224fa6e29f.tar.gz
itzks-systems-7d193fe6886a1cfe466d4f6998a59e224fa6e29f.tar.bz2
itzks-systems-7d193fe6886a1cfe466d4f6998a59e224fa6e29f.zip
debian/itzks-systems-common.postinst: Only execute update-desktop-database if it exists (i.e., if bin:package desktop-file-utils is installed).
-rw-r--r--debian/changelog3
-rwxr-xr-xdebian/itzks-systems-common.postinst4
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b0b948d..2c96019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ itzks-systems (2015.07.15.3) UNRELEASED; urgency=medium
for them.
* etc/standardskriver.cfg:
+ Add Schulbibliothek-printer (EBG).
+ * debian/itzks-systems-common.postinst:
+ + Only execute update-desktop-database if it exists (i.e., if
+ bin:package desktop-file-utils is installed).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 15 Jul 2015 13:53:44 +0200
diff --git a/debian/itzks-systems-common.postinst b/debian/itzks-systems-common.postinst
index a2e7da4..4c0964b 100755
--- a/debian/itzks-systems-common.postinst
+++ b/debian/itzks-systems-common.postinst
@@ -30,7 +30,7 @@ case "$1" in
echo $RET 1> /etc/debian-edu/itzks.school
# deploy Wine desktop fixes if Wine is installed
- if which wine 1>/dev/null; then
+ if which update-desktop-database 1>/dev/null && which wine 1>/dev/null; then
if [ ! -e /usr/share/applications/wine.desktop ]; then
cp /usr/share/itzks-systems-common/wine-fixes/wine.desktop /usr/share/applications/wine.desktop
fi
@@ -47,7 +47,7 @@ case "$1" in
cp /usr/share/itzks-systems-common/wine-fixes/wine-bin /usr/lib/mime/packages/wine-bin
fi
update-desktop-database
- else
+ elif which update-desktop-database 1>/dev/null; then
if [ -e /usr/share/applications/wine.desktop ]; then
rm -f /usr/share/applications/wine.desktop
fi