support starting a kitty window with the 'kitten' command

Author: k4lizen

pwnlib/util/misc.py

@@ -450,13 +450,11 @@ def run_in_new_terminal(command, terminal=None, args=None, kill_at_exit=True, pr
     log.debug("Launching a new terminal: %r" % argv)
 
     stdin = stdout = stderr = open(os.devnull, 'r+b')
-    if terminal == 'tmux' or terminal == 'kitty':
+    if terminal == 'tmux' or terminal in ('kitty', 'kitten'):
         stdout = subprocess.PIPE
 
     p = subprocess.Popen(argv, stdin=stdin, stdout=stdout, stderr=stderr, preexec_fn=preexec_fn)
 
-    kittyid = None
-
     if terminal == 'tmux':
         out, _ = p.communicate()
         try:
@@ -469,7 +467,7 @@ def run_in_new_terminal(command, terminal=None, args=None, kill_at_exit=True, pr
         with subprocess.Popen((qdbus, konsole_dbus_service, '/Sessions/{}'.format(last_konsole_session),
                                'org.kde.konsole.Session.processId'), stdout=subprocess.PIPE) as proc:
             pid = int(proc.communicate()[0].decode())
-    elif terminal == 'kitty':
+    elif terminal in ('kitty', 'kitten'):
         pid = p.pid
 
         out, _ = p.communicate()
@@ -503,7 +501,7 @@ def kill():
             try:
                 if terminal == 'qdbus':
                     os.kill(pid, signal.SIGHUP)
-                elif terminal == 'kitty':
+                elif terminal in ('kitty', 'kitten'):
                     subprocess.Popen(["kitten", "@", "close-window", "--match", "id:{}".format(kittyid)], stderr=stderr)
                 else:
                     os.kill(pid, signal.SIGTERM)