From 886412fcf1dcf1d0a6cbe4c616ff56ae835fd12d Mon Sep 17 00:00:00 2001
From: Jay W <git.jaydoubleu@gmail.com>
Date: Tue, 1 Feb 2022 19:06:23 +0000
Subject: [PATCH] Add logic to remove duplicate shell from args

---
 terminatorlib/util.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/terminatorlib/util.py b/terminatorlib/util.py
index 72eb071e..eda14ced 100644
--- a/terminatorlib/util.py
+++ b/terminatorlib/util.py
@@ -413,6 +413,11 @@ def get_flatpak_args(args, envv, cwd):
         "flatpak-spawn", "--host", "--watch-bus", "--forward-fd=1",
         "--forward-fd=2", "--directory={}".format(cwd)
     ]
+    # Detect and remove duplicate shell in args
+    # to work around vte.spawn_sync() requirement.
+    if len(set([args[0], args[1]])) == 1:
+        del args[0]
+
     flatpak_args = flatpak_spawn + env_args + args
 
     dbg('returned flatpak args:  %s' % flatpak_args)