autodetect gnome-terminal-server location

Also, make the dependency on gnome-terminal-server explicit.

Closes #5

4 files changed, 18 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 351e57ec75c6..294e4e61f940 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = neovim-gnome-terminal-wrapper
 	pkgdesc = A wrapper for running neovim in a separate instance of gnome-terminal
 	pkgver = 2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://github.com/fmoralesc/
 	arch = any
 	license = GPL
@@ -12,7 +12,7 @@ pkgbase = neovim-gnome-terminal-wrapper
 	source = nvim-wrapper
 	source = neovim.svg
 	md5sums = c5b9b5db24db814376b6925ce0f9ad52
-	md5sums = 31d6960e3dd9592a812cba50ca895c4f
+	md5sums = 6a2aa98a447d3aa661e39c9b31c4aa7b
 	md5sums = 2b271742492f200bcac78dbfe33caa3c
 
 pkgname = neovim-gnome-terminal-wrapper
diff --git a/PKGBUILD b/PKGBUILD
index 4aafdddccef7..b12efabccca0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Felipe Morales <hel.sheep@gmail.com>
 pkgname=neovim-gnome-terminal-wrapper
 pkgver=2
-pkgrel=2
+pkgrel=3
 pkgdesc="A wrapper for running neovim in a separate instance of gnome-terminal"
 arch=(any)
 url="http://github.com/fmoralesc/"
@@ -12,7 +12,7 @@ source=('neovim.desktop'
         'nvim-wrapper'
         'neovim.svg')
 md5sums=('c5b9b5db24db814376b6925ce0f9ad52'
-         '31d6960e3dd9592a812cba50ca895c4f'
+         '6a2aa98a447d3aa661e39c9b31c4aa7b'
          '2b271742492f200bcac78dbfe33caa3c')
 
 package() {
diff --git a/README.md b/README.md
index cfee6d7bcbb6..016f56d6d38b 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ it can be associated to filetypes, etc.)
 ## Requisites
 
 * neovim
-* gnome-terminal
+* gnome-terminal >= 3.16 (uses gnome-terminal-server)
 * python-dbus
 
 ## Setup
diff --git a/nvim-wrapper b/nvim-wrapper
index e9398c1281a3..af4be8527b39 100755
--- a/nvim-wrapper
+++ b/nvim-wrapper
@@ -13,8 +13,18 @@ APP_ID = 'org.neovim'
 CLASS = 'neovim'
 NAME = 'Neovim'
 
+def find_terminal_server():
+    candidates = list(filter(os.path.exists, \
+                            ('/usr/lib/gnome-terminal/gnome-terminal-server', # arch et al
+                             '/usr/libexec/gnome-terminal-server')))          # fedora 22
+    if len(candidates) > 0:
+        return candidates[0]
+    else:
+        print("nvim-wrapper needs gnome-terminal-server, but it wasn't found.")
+        sys.exit()
+
 SERVER_CMD = [
-    '/usr/lib/gnome-terminal/gnome-terminal-server',
+    find_terminal_server(),
     '--app-id', APP_ID,
     '--class', CLASS,
     '--name', NAME,
@@ -29,6 +39,7 @@ TERM_CMD = [
     'nvim',
 ]
 
+
 def main():
     """Run nvim inside gnome-terminal"""
     session_bus = dbus.SessionBus()
@@ -39,7 +50,7 @@ def main():
         subprocess.Popen(SERVER_CMD)
 
     # wait until the name is registered, or 2 seconds pass (when launching from
-    # cold cache it might more time)
+    # cold cache it might take more time)
     timeout = time() + 2
     while not session_bus.name_has_owner(APP_ID) and time() <= timeout:
         pass