system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 18:46:18 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Userland: Fix PATH environment variable ordering

Browse source
This commit is contained in:
Jean-Baptiste Boric 2021-08-07 14:05:33 +02:00 committed by Andreas Kling
parent b1add5860b
commit 2084289162
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/RunningTests.md
View file

@ -103,7 +103,7 @@ The system server entry looks as below:
[TestRunner@ttyS0]
Executable=/home/anon/tests/run-tests-and-shutdown.sh
StdIO=/dev/ttyS0
Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/bin:/usr/bin:/usr/local/bin
Environment=DO_SHUTDOWN_AFTER_TESTS=1 TERM=xterm PATH=/usr/local/bin:/usr/bin:/bin
User=anon
WorkingDirectory=/home/anon
BootModes=self-test

2
Userland/Applications/Terminal/main.cpp
View file

@ -96,7 +96,7 @@ static void run_command(String command, bool keep_open)
args[arg_index++] = "-c";
args[arg_index++] = command.characters();
}
const char* envs[] = { "TERM=xterm", "PAGER=more", "PATH=/bin:/usr/bin:/usr/local/bin", nullptr };
const char* envs[] = { "TERM=xterm", "PAGER=more", "PATH=/usr/local/bin:/usr/bin:/bin", nullptr };
int rc = execve(shell.characters(), const_cast<char**>(args), const_cast<char**>(envs));
if (rc < 0) {
perror("execve");

2
Userland/DevTools/HackStudio/main.cpp
View file

@ -114,7 +114,7 @@ static void update_path_environment_variable()
path.append(getenv("PATH"));
if (path.length())
path.append(":");
path.append("/bin:/usr/bin:/usr/local/bin");
path.append("/usr/local/bin:/usr/bin:/bin");
setenv("PATH", path.to_string().characters(), true);
}

2
Userland/Services/TelnetServer/main.cpp
View file

@ -70,7 +70,7 @@ static void run_command(int ptm_fd, String command)
args[1] = "-c";
args[2] = command.characters();
}
const char* envs[] = { "TERM=xterm", "PATH=/bin:/usr/bin:/usr/local/bin", nullptr };
const char* envs[] = { "TERM=xterm", "PATH=/usr/local/bin:/usr/bin:/bin", nullptr };
rc = execve("/bin/Shell", const_cast<char**>(args), const_cast<char**>(envs));
if (rc < 0) {
perror("execve");

2
Userland/Shell/Shell.cpp
View file

@ -1821,7 +1821,7 @@ Shell::Shell()
path.append(getenv("PATH"));
if (path.length())
path.append(":");
path.append("/bin:/usr/bin:/usr/local/bin");
path.append("/usr/local/bin:/usr/bin:/bin");
setenv("PATH", path.to_string().characters(), true);
}