fixed crash when using fish shell

lighttigerXIV · May 2, 2023 · d6bc215 · d6bc215
1 parent 3307b06
commit d6bc215
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/main.py b/main.py
@@ -50,11 +50,14 @@ def on_event(self, event, extension):
         terminal = extension.preferences["term"]
         exec = extension.preferences["exec"]
         command = data["command"]
+        shell = extension.preferences["shell"]
 
-        userShell = environ["SHELL"]
+        envUserShell = environ["SHELL"]
 
-
-        subprocess.run( [f'{terminal} {exec} {userShell} -c -i "{command}; {userShell}"'], shell=True )
+        if shell == "fish":
+            subprocess.run( [f'{terminal} {exec} {envUserShell} -c "{command}; {envUserShell}"'], shell=True )
+        else:
+            subprocess.run( [f'{terminal} {exec} {envUserShell} -c -i "{command}; {envUserShell}"'], shell=True )
 
         return HideWindowAction()
 

diff --git a/manifest.json b/manifest.json
@@ -29,6 +29,16 @@
             "description": "The parameter your terminal uses to execute commands",
             "default_value": "--"
         },
+        {
+            "id": "shell",
+            "type": "select",
+            "name": "Shell",
+            "default_value": "others",
+            "options": [
+                {"text": "Bash / Zsh", "value": "others"},
+                {"text": "Fish", "value": "fish"}
+            ]
+        },
         {
             "id": "icon",
             "type": "select",