Merge branch 'master' of git://source.jones.dk/local-COMMON

3 files changed, 9 insertions, 3 deletions

diff --git a/apt/apt.conf.d/99-local-set-preferred-x-session-manager b/apt/apt.conf.d/99-local-set-preferred-x-session-manager
index a842f9f..4e0b73f 100755
--- a/apt/apt.conf.d/99-local-set-preferred-x-session-manager
+++ b/apt/apt.conf.d/99-local-set-preferred-x-session-manager
@@ -2,5 +2,7 @@
 
 DPkg
 {
-Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/gnome-session ]; then /usr/sbin/update-alternatives --set x-session-manager /usr/bin/gnome-session; else exit 0; fi";};
+Post-Invoke {
+"s=/usr/bin/gnome-session; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-session-manager $s"
+;};
 };
diff --git a/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator b/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator
index a16ef99..ac74e1b 100755
--- a/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator
+++ b/apt/apt.conf.d/99-local-set-preferred-x-terminal-emulator
@@ -2,5 +2,7 @@
 
 DPkg
 {
-Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/urxvt ]; then /usr/sbin/update-alternatives --set x-terminal-emulator /usr/bin/urxvt; else exit 0; fi";};
+Post-Invoke {
+"s=/usr/bin/urxvtcd; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-terminal-emulator $s"
+;};
 };
diff --git a/apt/apt.conf.d/99-local-set-preferred-x-www-browser b/apt/apt.conf.d/99-local-set-preferred-x-www-browser
index 9302c6e..5fbbe90 100755
--- a/apt/apt.conf.d/99-local-set-preferred-x-www-browser
+++ b/apt/apt.conf.d/99-local-set-preferred-x-www-browser
@@ -2,5 +2,7 @@
 
 DPkg
 {
-Post-Invoke {"if [ -x /usr/sbin/update-alternatives ] && [ -x /usr/bin/iceweasel ]; then /usr/sbin/update-alternatives --set x-www-browser /usr/bin/iceweasel; else exit 0; fi";};
+Post-Invoke {
+"s=/usr/bin/iceweasel; [ ! -x $s ] || /usr/sbin/update-alternatives --set x-www-browser $s"
+;};
 };