summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <matthias.beyer@atos.net>2021-01-19 09:40:31 +0100
committerMatthias Beyer <matthias.beyer@atos.net>2021-01-19 15:31:06 +0100
commit7e971808b807cfc3a39de9bdbca2e7bd599b0e08 (patch)
tree9aa86736caea1e572841bfc064aaae509a93614a
parent07f36a103ced7beb07ead5fa5d07ff0ce4178ece (diff)
Fix: Do not add newlines when interpolating script helpers
Signed-off-by: Matthias Beyer <matthias.beyer@atos.net>
-rw-r--r--src/package/script.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/package/script.rs b/src/package/script.rs
index 35b7984..bb9b6dc 100644
--- a/src/package/script.rs
+++ b/src/package/script.rs
@@ -256,7 +256,7 @@ impl HelperDef for PhaseHelper {
.and_then(|phase_name| {
out.write("echo '#BUTIDO:PHASE:")?;
out.write(phase_name)?;
- out.write("'\n")?;
+ out.write("'")?;
Ok(())
})
}
@@ -281,7 +281,7 @@ impl HelperDef for StateHelper {
.ok_or_else(|| RenderError::new("Required parameter must be a string: state"))
.and_then(|state| match state {
"OK" => {
- out.write("echo '#BUTIDO:STATE:OK'\n")?;
+ out.write("echo '#BUTIDO:STATE:OK'")?;
Ok(())
}
"ERR" => {
@@ -290,7 +290,7 @@ impl HelperDef for StateHelper {
})?;
out.write("echo '#BUTIDO:STATE:ERR:")?;
out.write(state_msg.value().render().as_ref())?;
- out.write("'\n")?;
+ out.write("'")?;
Ok(())
}
other => Err(RenderError::new(format!(
@@ -321,7 +321,7 @@ impl HelperDef for ProgressHelper {
.and_then(|progress| {
out.write("echo '#BUTIDO:PROGRESS:")?;
out.write(&progress.to_string())?;
- out.write("'\n")?;
+ out.write("'")?;
Ok(())
})
}