Skip to content

Commit cb891ff

Browse files
author
Jason Heath
committed
Requires --scaffolding to add non-placheolder scaffolding
The templates have a switch in them that wasn't being respected. In the template_plan.sh linux version we find this version of it | {{ #if scaffolding_ident }} | pkg_scaffolding="{{ scaffolding_ident }}" | {{ else }} | # pkg_scaffolding="some/scaffolding" | {{ /if }} In reality 'pkg_scaffolding='core/scaffolding=ruby"' was always being added to the plan file when 'pkg_scaffolding="some/scaffolding"' should have been what was added unless the --scaffolding option was used. Signed-off-by: Jason Heath <jason.heath@progress.com>
1 parent 1e29e96 commit cb891ff

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

  • components/hab/src/cli_v4/plan

components/hab/src/cli_v4/plan/init.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,12 @@ impl PlanInit {
3535
pub(crate) fn do_command(&self, ui: &mut UI) -> HabResult<()> {
3636
let origin = origin_param_or_env(&self.origin)?;
3737

38-
// Use scaffold_check for all platforms - it handles aliases and validation
39-
let scaffolding = crate::scaffolding::scaffold_check(ui, self.scaffolding.as_deref())?;
38+
// Only call scaffold_check if scaffolding was explicitly provided
39+
let scaffolding = if self.scaffolding.is_some() {
40+
crate::scaffolding::scaffold_check(ui, self.scaffolding.as_deref())?
41+
} else {
42+
None // Don't auto-detect if no scaffolding was specified
43+
};
4044

4145
crate::command::plan::init::start(ui, &origin, self.min, scaffolding, self.pkg_name.clone())
4246
}

0 commit comments

Comments
 (0)