added a script which handles the sessions correctly

4 files changed, 38 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c289340dd9b4..f208f4a4a28f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue May 31 21:56:17 UTC 2016
+# Fri Jun  3 05:32:16 UTC 2016
 pkgbase = gtk3-nocsd-git
 	pkgdesc = A hack to disable gtk+ 3 client side decoration
-	pkgver = r52.59265f9
+	pkgver = r54.a590b96
 	pkgrel = 1
 	url = https://github.com/PCMan/gtk3-nocsd
 	arch = i686
@@ -15,8 +15,9 @@ pkgbase = gtk3-nocsd-git
 	depends = gtk3
 	conflicts = gtk3-nocsd
 	source = git+https://github.com/PCMan/gtk3-nocsd
+	source = 30-gtk3-nocsd.sh
 	sha256sums = SKIP
+	sha256sums = 607ace12e8711ac91463ffe8a63a72a22ef32a0f5c46ee4bc720347e5d7e81f1
 
 pkgname = gtk3-nocsd-git
-	install = gtk3-nocsd.install
 
diff --git a/30-gtk3-nocsd.sh b/30-gtk3-nocsd.sh
new file mode 100755
index 000000000000..02639f0348b2
--- /dev/null
+++ b/30-gtk3-nocsd.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+if [ -n "${GNOME_DESKTOP_SESSION_ID-}" ] ; then
+  # just in case DESKTOP_SESSION wasn't properly set
+  _check=gnome
+else
+  _check="${DESKTOP_SESSION-}"
+fi
+
+case "${_check}" in
+  gnome|gnome-*|*/gnome|*/gnome-*)
+    if [ x"$GTK_CSD" = x"0" ] ; then
+      unset GTK_CSD
+    fi
+    ;;
+  *)
+    if [ -z "$GTK_CSD" ] ; then
+      GTK_CSD=0
+    fi
+    export GTK_CSD
+    if [ x"$GTK_CSD"x = x"0"x ] ; then
+      export LD_PRELOAD="libgtk3-nocsd.so.0${LD_PRELOAD:+:$LD_PRELOAD}"
+    fi
+    ;;
+esac
+
+unset _check
diff --git a/PKGBUILD b/PKGBUILD
index 4c288a07210f..e880ed83ec2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Marco Kundt <mrckndt@gmail.com>
 
 pkgname=gtk3-nocsd-git
-pkgver=r52.59265f9
+pkgver=r54.a590b96
 pkgrel=1
 pkgdesc='A hack to disable gtk+ 3 client side decoration'
 arch=('i686' 'x86_64')
@@ -10,9 +10,11 @@ license=('GPL')
 depends=('gtk3')
 makedepends=('git' 'pkgconfig' 'gobject-introspection' 'gtk3')
 conflicts=('gtk3-nocsd')
-source=(git+https://github.com/PCMan/gtk3-nocsd)
+source=(git+https://github.com/PCMan/gtk3-nocsd
+        30-gtk3-nocsd.sh)
 
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '607ace12e8711ac91463ffe8a63a72a22ef32a0f5c46ee4bc720347e5d7e81f1')
 
 _gitname='gtk3-nocsd'
 
@@ -33,5 +35,6 @@ package() {
   install -D -m 0644 gtk3-nocsd.1 "${pkgdir}"/usr/share/man/man1/gtk3-nocsd.1
   install -D -m 0644 gtk3-nocsd.bash-completion "${pkgdir}"/usr/share/bash-completion/completions/gtk3-nocsd
 
-  install=gtk3-nocsd.install
+  cd "$srcdir"
+  install -D -m 0755 30-gtk3-nocsd.sh "${pkgdir}"/etc/X11/xinit/xinitrc.d/30-gtk3-nocsd.sh
 }
diff --git a/gtk3-nocsd.install b/gtk3-nocsd.install
deleted file mode 100644
index ca8b3790bb97..000000000000
--- a/gtk3-nocsd.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-  echo "Note: To get gtk3-nocsd runnig you need to add this to your ~/.bashrc"
-  echo "export GTK_CSD=0"
-  echo 'export LD_PRELOAD="/usr/lib/libgtk3-nocsd.so.0:${LD_PRELOAD}"'
-}