From 06a2d5426f57c8fbd163f8a3820a892add95e734 Mon Sep 17 00:00:00 2001
From: Stephen Boddy <stephen.j.boddy@gmail.com>
Date: Tue, 1 Sep 2015 23:22:03 +0200
Subject: [PATCH] (trunk-1628) Adjustment to the way alternatives are set up
 that should cure blurry/incorrect icons in task switchers

---
 debian/terminator.postinst | 5 ++++-
 debian/terminator.prerm    | 2 ++
 setup.py                   | 1 +
 terminator.wrapper         | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100755 terminator.wrapper

diff --git a/debian/terminator.postinst b/debian/terminator.postinst
index d3ebb076..0727a862 100755
--- a/debian/terminator.postinst
+++ b/debian/terminator.postinst
@@ -1,9 +1,12 @@
 #!/bin/sh -e
 
 if [ "$1" = "configure" ]; then
+        # Ensure the old alternative is removed
+        update-alternatives --remove terminator /usr/bin/terminator || true
+        update-alternatives --remove x-terminal-emulator /usr/bin/terminator
         # Add an alternative for x-terminal-emulator
         update-alternatives --install /usr/bin/x-terminal-emulator \
-                x-terminal-emulator /usr/bin/terminator 50 \
+                x-terminal-emulator /usr/bin/terminator.wrapper 50 \
                 --slave /usr/share/man/man1/x-terminal-emulator.1.gz \
                 x-terminal-emulator.1.gz /usr/share/man/man1/terminator.1.gz
 fi
diff --git a/debian/terminator.prerm b/debian/terminator.prerm
index be382e0e..7f525d60 100644
--- a/debian/terminator.prerm
+++ b/debian/terminator.prerm
@@ -3,6 +3,8 @@
 if [ "$1" = remove ]; then
         update-alternatives --remove terminator /usr/bin/terminator || true
         update-alternatives --remove x-terminal-emulator /usr/bin/terminator
+        update-alternatives --remove terminator.wrapper /usr/bin/terminator.wrapper || true
+        update-alternatives --remove x-terminal-emulator /usr/bin/terminator.wrapper
 fi
 
 #DEBHELPER#
diff --git a/setup.py b/setup.py
index df7259ab..11e5f984 100755
--- a/setup.py
+++ b/setup.py
@@ -219,6 +219,7 @@ setup(name=APP_NAME.capitalize(),
       license='GNU GPL v2',
       scripts=['terminator', 'remotinator'],
       data_files=[
+                  ('bin', ['terminator.wrapper']),
                   ('share/appdata', ['data/terminator.appdata.xml']),
                   ('share/applications', ['data/terminator.desktop']),
                   (os.path.join(man_dir, 'man1'), ['doc/terminator.1']),
diff --git a/terminator.wrapper b/terminator.wrapper
new file mode 100755
index 00000000..e7170050
--- /dev/null
+++ b/terminator.wrapper
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+terminator $@
+