!wip

Author: tony

tmuxp/config.py

@@ -152,12 +152,13 @@ def inline(sconf):
 
         if len(sconf.keys()) == int(1):
             sconf = sconf["shell_command"]
-    if (
-        "shell_command_before" in sconf
-        and isinstance(sconf["shell_command_before"], list)
-        and len(sconf["shell_command_before"]) == 1
-    ):
-        sconf["shell_command_before"] = sconf["shell_command_before"][0]
+    # todo rewrite inlines
+    # if (
+    #     "shell_command_before" in sconf
+    #     and isinstance(sconf["shell_command_before"], list)
+    #     and len(sconf["shell_command_before"]) == 1
+    # ):
+    #     sconf["shell_command_before"] = sconf["shell_command_before"][0]
 
     # recurse into window and pane config items
     if "windows" in sconf:
@@ -269,9 +270,13 @@ def expand(sconf, cwd=None, parent=None):
     if "shell_command_before" in sconf and isinstance(
         sconf["shell_command_before"], list
     ):
-        sconf["shell_command_before"] = [
-            expandshell(scmd) for scmd in sconf["shell_command_before"]
-        ]
+        for i, scmd in enumerate(sconf["shell_command_before"]):
+            if isinstance(scmd, dict):
+                scmd["shell_command"] = expandshell(scmd.get("shell_command"))
+            if isinstance(scmd, str):
+                scmd = {"shell_command": expandshell(scmd)}
+            sconf["shell_command_before"][i] = scmd
+            print(sconf)
 
     # recurse into window and pane config items
     if "windows" in sconf:
@@ -455,7 +460,9 @@ def import_tmuxinator(sconf):
     if "rbenv" in sconf:
         if "shell_command_before" not in tmuxp_config:
             tmuxp_config["shell_command_before"] = []
-        tmuxp_config["shell_command_before"].append("rbenv shell %s" % sconf["rbenv"])
+        tmuxp_config["shell_command_before"].append(
+            {"shell_command": "rbenv shell %s" % sconf["rbenv"]}
+        )
 
     for w in sconf["windows"]:
         for k, v in w.items():