kjuulh/cuddle-v2
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Projects Releases Wiki Activity

update schema to include variables

Browse Source
This commit is contained in:
Kasper Juul Hermansen
2022-08-10 23:31:07 +02:00
parent 60398bbb2e
commit 91072cc4e6
3 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cuddle_cli/src/actions/shell.rs
View File

@@ -28,18 +28,18 @@ Starting running shell action: {}
let mut process = Command::new(self.path)
.current_dir(".")
.stdout(Stdio::piped())
.stderr(Stdio::piped())
//.stdout(Stdio::piped())
//.stderr(Stdio::piped())
.spawn()?;
{
let stdout = process.stdout.as_mut().unwrap();
let stdout_reader = BufReader::new(stdout);
let mut stdout_lines = stdout_reader.lines();
while let Some(Ok(line)) = stdout_lines.next() {
log::info!(process=log::as_display!(self.name); "{}", line)
}
}
//{
// let stdout = process.stdout.as_mut().unwrap();
// let stdout_reader = BufReader::new(stdout);
// let mut stdout_lines = stdout_reader.lines();
// while let Some(Ok(line)) = stdout_lines.next() {
// log::info!("{}", line);
// }
//}
process.wait()?;

8
cuddle_cli/src/context.rs
View File

@@ -23,12 +23,14 @@ pub fn extract_cuddle(config: CuddleConfig) -> anyhow::Result<Arc<Mutex<Vec<Cudd
curr_dir.push(".cuddle/");
let fetch_policy = config.get_fetch_policy()?;
if let CuddleFetchPolicy::Always = fetch_policy {
if let Err(res) = std::fs::remove_dir_all(curr_dir) {
panic!("{}", res)
if curr_dir.exists() {
if let Err(res) = std::fs::remove_dir_all(curr_dir) {
panic!("{}", res)
}
}
}
// Load main cuddle file
// Load main cuddle file.
let cuddle_yaml = find_root_cuddle()?;
log::trace!(cuddle_yaml=log::as_debug!(cuddle_yaml); "Find root cuddle");