Manipulates string in C#, removes 'awk' pipe from shell command

chickensoft-games · Jan 6, 2024 · 474f707 · 474f707
1 parent d9e89d5
commit 474f707
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,6 @@ GodotEnv/addons
 GodotEnv/.addons
 GodotEnv/addons.json
 GodotEnv/addons.jsonc
+GodotEnv.sln.DotSettings.user
+
+.idea/
diff --git a/GodotEnv/src/common/clients/EnvironmentVariableClient.cs b/GodotEnv/src/common/clients/EnvironmentVariableClient.cs
@@ -27,8 +27,8 @@ public interface IEnvironmentVariableClient {
 public class EnvironmentVariableClient :
   IEnvironmentVariableClient {
 
-  public const string USER_SHELL_COMMAND_MAC = "dscl . -read /Users/$USER UserShell | awk -F/ '{ print $NF }'";
-  public const string USER_SHELL_COMMAND_LINUX = "getent passwd $USER | awk -F/ '{ print $NF }'";
+  public const string USER_SHELL_COMMAND_MAC = "dscl . -read /Users/$USER UserShell";
+  public const string USER_SHELL_COMMAND_LINUX = "getent passwd $USER";
   public static readonly string[] SUPPORTED_UNIX_SHELLS = ["bash", "zsh"];
 
   public IProcessRunner ProcessRunner { get; }
@@ -151,13 +151,15 @@ public async Task<string> GetUserDefaultShell() {
           var processResult = await shell.Run(
             "sh", ["-c", USER_SHELL_COMMAND_MAC]
           );
-          return processResult.StandardOutput.TrimEnd(Environment.NewLine.ToCharArray());
+          var shellName = processResult.StandardOutput.TrimEnd(Environment.NewLine.ToCharArray());
+          return shellName.Split('/').Last();
         }
       case OSType.Linux: {
           var processResult = await shell.Run(
             "sh", ["-c", USER_SHELL_COMMAND_LINUX]
           );
-          return processResult.StandardOutput.TrimEnd(Environment.NewLine.ToCharArray());
+          var shellName = processResult.StandardOutput.TrimEnd(Environment.NewLine.ToCharArray());
+          return shellName.Split('/').Last();
         }
       case OSType.Windows:
       case OSType.Unknown: