Skip to content

fix: restore OpenOCD scripts/ search path for bundled releases #11

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

Merged
nedseb merged 2 commits into from
Apr 28, 2026
Merged

fix: restore OpenOCD scripts/ search path for bundled releases #11

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d9d303
fix: add <exe_dir>/scripts to OpenOCD search path
nedseb Apr 28, 2026
568e386
fix: pass scripts path as PathBuf instead of converting to UTF-8
nedseb Apr 28, 2026
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
11 changes: 10 additions & 1 deletion src/open_ocd_task.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ where
.into_string()
.map_err(|_| "Failed to convert tmp_dir to string.")?;

let cmd = cmd.args(&[
cmd.args(&[
"-s",
&config_folder,
"-s",
Expand All @@ -132,6 +132,15 @@ where
&ws_foler,
]);

// The xpack-bundled OpenOCD ships its standard scripts alongside the
// executable in `<exe_dir>/scripts/`. Our .cfg files reference these via
// `source [find interface/...]`, which only resolves through OpenOCD's
// search path — add the directory if it exists.
let scripts_folder = dirs::get_exe_dir()?.join("scripts");
if scripts_folder.is_dir() {
cmd.arg("-s").arg(&scripts_folder);
}

let mut child = cmd
.stdout(Stdio::piped())
.stderr(Stdio::piped())
Expand Down