From ebe67702fd3dcedecfe36e29ff3f767534237159 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 May 2017 14:11:06 +0530
Subject: [PATCH] Simplify code to find path to calibre-debug

---
 src/calibre/debug.py | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/calibre/debug.py b/src/calibre/debug.py
index bf54dbb0ce..2838d0a3e7 100644
--- a/src/calibre/debug.py
+++ b/src/calibre/debug.py
@@ -13,21 +13,14 @@ from calibre import prints
 
 
 def get_debug_executable():
-    e = sys.executable if getattr(sys, 'frozen', False) else sys.argv[0]
     if hasattr(sys, 'frameworks_dir'):
         base = os.path.dirname(sys.frameworks_dir)
         if 'calibre-debug.app' not in base:
             base = os.path.join(base, 'calibre-debug.app', 'Contents')
-        exe = os.path.basename(e)
-        if '-debug' not in exe:
-            exe += '-debug'
-        exe = os.path.join(base, 'MacOS', exe)
-    else:
-        exe = e
-        if '-debug' not in exe:
-            base, ext = os.path.splitext(e)
-            exe = base + '-debug' + ext
-    return exe
+        return os.path.join(base, 'MacOS', 'calibre-debug')
+    if getattr(sys, 'frozen', False):
+        return os.path.join(os.path.dirname(os.path.abspath(sys.executable)), 'calibre-debug' + ('.exe' if iswindows else ''))
+    return 'calibre-debug'
 
 
 def run_calibre_debug(*args, **kw):
@@ -39,7 +32,7 @@ def run_calibre_debug(*args, **kw):
     exe = get_debug_executable()
     cmd = [exe] + list(args)
     kw['creationflags'] = creationflags
-    subprocess.Popen(cmd, **kw)
+    return subprocess.Popen(cmd, **kw)
 
 
 def option_parser():