Skip to content

Fix finding Box64 from PATH #2040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slipher wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −9
Open

Fix finding Box64 from PATH #2040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/engine/framework/VirtualMachine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,15 @@ static Cvar::Cvar<std::string> vm_box64_path(
// Resolve box64 binary path by looking for a provided one or searching PATH if not explicitly set.
static std::string ResolveBox64Path(std::string naclPath) {
std::string requestedPath = vm_box64_path.Get();
if (!requestedPath.empty()) {
if (!FS::RawPath::FileExists(requestedPath)) {
Sys::Error("Box64 emulation is enabled but the requested executable '%s' is missing", requestedPath);
}

return requestedPath;
}

if (requestedPath.empty()) {
{
std::string providedPath = FS::Path::Build(naclPath, "box64");

if (FS::RawPath::FileExists(providedPath)) {
Expand All @@ -118,14 +125,7 @@ static std::string ResolveBox64Path(std::string naclPath) {
return providedPath;
}

Log::Warn("Box64 emulation is enabled but the executable is not provided with the engine: %s", providedPath);
}

if (!FS::RawPath::FileExists(requestedPath)) {
Sys::Error("Box64 emulation is enabled but the requested executable is missing: %s", requestedPath);
}
else {
return requestedPath;
// Log::Warn("Box64 emulation is enabled but the executable is not provided with the engine: %s", providedPath);
}

const char* envPath = getenv("PATH");
Expand Down
Loading