[SCM] mate-desktop-environment Debian package branch, master, updated. 93ae501b602bd5176c6423df3ae0cbc81e664d17

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop-environment.git;a=commitdiff;h=2567575

The following commit has been merged in the master branch:
commit 25675758a4ab31f852e467a6562788c8c4d6d094
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun May 11 14:29:24 2014 +0200

    debian/mate-desktop-environment-core.postinst: Improve script.
---
 debian/mate-desktop-environment-core.postinst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/mate-desktop-environment-core.postinst b/debian/mate-desktop-environment-core.postinst
index 57c97fd..60e7699 100755
--- a/debian/mate-desktop-environment-core.postinst
+++ b/debian/mate-desktop-environment-core.postinst
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -6,12 +6,15 @@ if [ "$1" = "configure" ]; then
 	# For Debian jessie and beyond, gnome-keyring also starts in MATE desktop environments.
 	# For Debian wheezy, we ship our own .desktop files to start gnome-keyring
 	# Those we need to hard-remove if Debian wheezy is upgraded to jessie or later...
-	ls /etc/xdg/autostart/gnome-keyring-*.desktop | while read filename; do
+	ls /etc/xdg/autostart/gnome-keyring-*.desktop 2>/dev/null | while read filename; do
 		if egrep "^OnlyShowIn=.*MATE;.*" "$filename" 1>/dev/null; then
 			rm -f "${filename/gnome-keyring-/mate-gnome-keyring-}"
 		else
-			cp "$filename" "${filename/gnome-keyring-/mate-gnome-keyring-}"
-			sed -i "${filename/gnome-keyring-/mate-gnome-keyring-}" -e "s/OnlyShowIn=.*/OnlyShowIn=MATE;"
+			if [ ! -f "${filename/gnome-keyring-/mate-gnome-keyring-}" ]; then
+				cp "$filename" "${filename/gnome-keyring-/mate-gnome-keyring-}"
+				sed -i "${filename/gnome-keyring-/mate-gnome-keyring-}" \
+				    -e "s/OnlyShowIn=.*/OnlyShowIn=MATE;/"
+			fi
 		fi
 	done
 fi

-- 
mate-desktop-environment Debian package