From 84e10172721406d7ac81a67ac75139855481a1bb Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Wed, 29 Jun 2022 05:55:04 +0200
Subject: [PATCH] Userland: Add `/usr/local/sbin` to `PATH` by default

`e2fsprogs` adds its tools there.
---
 Userland/Applications/Terminal/main.cpp | 2 +-
 Userland/DevTools/HackStudio/main.cpp   | 2 +-
 Userland/Services/TelnetServer/main.cpp | 2 +-
 Userland/Shell/Shell.cpp                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Userland/Applications/Terminal/main.cpp b/Userland/Applications/Terminal/main.cpp
index 110f0a6487..bc942f7a97 100644
--- a/Userland/Applications/Terminal/main.cpp
+++ b/Userland/Applications/Terminal/main.cpp
@@ -161,7 +161,7 @@ static ErrorOr<void> run_command(String command, bool keep_open)
         arguments.append("-c");
         arguments.append(command);
     }
-    auto env = TRY(FixedArray<StringView>::try_create({ "TERM=xterm", "PAGER=more", "PATH=/usr/local/bin:/usr/bin:/bin" }));
+    auto env = TRY(FixedArray<StringView>::try_create({ "TERM=xterm", "PAGER=more", "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/bin" }));
     TRY(Core::System::exec(shell, arguments, Core::System::SearchInPath::No, env.span()));
     VERIFY_NOT_REACHED();
 }
diff --git a/Userland/DevTools/HackStudio/main.cpp b/Userland/DevTools/HackStudio/main.cpp
index 94fb9d2880..7f855470d7 100644
--- a/Userland/DevTools/HackStudio/main.cpp
+++ b/Userland/DevTools/HackStudio/main.cpp
@@ -124,7 +124,7 @@ static void update_path_environment_variable()
     path.append(getenv("PATH"));
     if (path.length())
         path.append(":");
-    path.append("/usr/local/bin:/usr/bin:/bin");
+    path.append("/usr/local/sbin:/usr/local/bin:/usr/bin:/bin");
     setenv("PATH", path.to_string().characters(), true);
 }
 
diff --git a/Userland/Services/TelnetServer/main.cpp b/Userland/Services/TelnetServer/main.cpp
index fa22b97182..33b81d304e 100644
--- a/Userland/Services/TelnetServer/main.cpp
+++ b/Userland/Services/TelnetServer/main.cpp
@@ -71,7 +71,7 @@ static void run_command(int ptm_fd, String command)
             args[1] = "-c";
             args[2] = command.characters();
         }
-        char const* envs[] = { "TERM=xterm", "PATH=/usr/local/bin:/usr/bin:/bin", nullptr };
+        char const* envs[] = { "TERM=xterm", "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/bin", nullptr };
         rc = execve("/bin/Shell", const_cast<char**>(args), const_cast<char**>(envs));
         if (rc < 0) {
             perror("execve");
diff --git a/Userland/Shell/Shell.cpp b/Userland/Shell/Shell.cpp
index 41907f5227..d1a39477a5 100644
--- a/Userland/Shell/Shell.cpp
+++ b/Userland/Shell/Shell.cpp
@@ -2186,7 +2186,7 @@ Shell::Shell()
         path.append(getenv("PATH"));
         if (path.length())
             path.append(":");
-        path.append("/usr/local/bin:/usr/bin:/bin");
+        path.append("/usr/local/sbin:/usr/local/bin:/usr/bin:/bin");
         setenv("PATH", path.to_string().characters(), true);
     }