Skip to content

WIP: don't use build.{sh,bat} by default in outputs #1367

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: don't use build.{sh,bat} by default in outputs #1367

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
13 changes: 2 additions & 11 deletions src/script/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,9 @@ impl Script {
extensions: &[&str],
) -> Result<ResolvedScriptContents, std::io::Error> {
let script_content = match self.contents() {
// No script was specified, so we try to read the default script. If the file cannot be
// found we return an empty string.
// No script was specified, which means we return an empty string.
ScriptContent::Default => {
let recipe_file = self.find_file(recipe_dir, extensions, Path::new("build"));
if let Some(recipe_file) = recipe_file {
match fs_err::read_to_string(&recipe_file) {
Err(e) => Err(e),
Ok(content) => Ok(ResolvedScriptContents::Path(recipe_file, content)),
}
} else {
Ok(ResolvedScriptContents::Missing)
}
Ok(ResolvedScriptContents::Missing)
}

// The scripts path was explicitly specified. If the file cannot be found we error out.
Expand Down
Loading