Pagwin/ppi
1
0
Fork 0
mirror of https://github.com/Pagwin-Fedora/ppi.git synced 2025-07-17 22:15:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

got things to a point where skeletons work the way I want them to(I think)

Browse source
This commit is contained in:
Pagwin 2022-09-25 16:20:58 -04:00
parent 29a82376d6
commit 616049c7dc
3 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -284,7 +284,7 @@ checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
[[package]]
name = "ppi"
version = "1.0.0"
version = "1.1.0"
dependencies = [
"clap",
"dirs",

2
Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ppi"
version = "1.0.0"
version = "1.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

31
src/main.rs
View file

@ -102,8 +102,9 @@ fn main() -> Result<(),Errors> {
std::io::stdin().read_line(&mut String::new())?;
}
eprintln!("checking out appropriate branch");
handle_process(std::process::Command::new("git")
.args(["checkout", skelly_branch.as_str()]))?;
// let branch = repo.branches(Some(git2::BranchType::Remote))?.find(|branch|{
// if let Ok(branch) = branch{
// if let Ok(Some(name)) = branch.0.name(){
@ -148,15 +149,21 @@ fn main() -> Result<(),Errors> {
}
let pwd = repo.path().parent().expect("very bad cloning into the root dir happening");
eprintln!("rebasing skeleton's commits down into single commit {:?}", pwd);
// I give up git2 documentation/api is just too bad for me to do this
std::process::Command::new("git")
// I give up git2 documentation/api is just too bad for me to do this with it
handle_process(std::process::Command::new("git")
.current_dir(pwd)
.args(["reset", "--mixed" , oldest_commit.id().as_bytes().iter().map(|byte|format!("{:x}",byte)).collect::<String>().chars().take(7).collect::<String>().as_str()])
.status()?;
std::process::exit(std::process::Command::new("git")
.args(["reset", "--mixed" , oldest_commit.id().as_bytes().iter().map(|byte|format!("{:x}",byte)).collect::<String>().chars().take(7).collect::<String>().as_str()]))?;
handle_process(std::process::Command::new("git")
.current_dir(pwd)
.args(["commit", "--amend", "-am", format!("").as_str(), oldest_commit.id().as_bytes().iter().map(|byte|format!("{:x}",byte)).collect::<String>().chars().take(7).collect::<String>().as_str()])
.status()?.code().ok_or(Errors::Unknown)?);
.args(["add", "--all"]))?;
handle_process(std::process::Command::new("git")
.current_dir(pwd)
.args(["commit", "--amend", "-am", format!("initialized from {} skeleton", skelly_name).as_str()]))?;
std::process::exit(0)
}
None=>{
eprintln!("failed to provide a path to clone the skeleton directory into");
@ -187,7 +194,11 @@ fn cli_fallback<S:AsRef<OsStr>, P:AsRef<Path>>(source:S, dest: P)->Result<(),Cli
.arg("clone")
.arg(source)
.arg(dest.as_ref());
if !child.spawn()?.wait()?.success() {
handle_process(&mut child)
}
fn handle_process<'proc,P:Into<&'proc mut std::process::Command>>(cmd:P) -> Result<(),CliError>{
if !cmd.into().status()?.success() {
Err(CliError::NonZero)
}
else{