stubbfel/nixide
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

start container

Browse Source
This commit is contained in:
stubbfelnewpc
2020-07-08 23:54:30 +02:00
parent df4befae64
commit 558ec03db6
2 changed files with 71 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
control/cli/src/main.rs
View File

@@ -141,7 +141,7 @@ fn main() {
.arg("-TERM")
.arg("-g")
.arg(ide_id)
.output().unwrap();
.output().unwrap();
},
(SYSTEMD_SUBCOMMAND_NAME, Some(system_cmd)) => {
let ide_service_name = system_cmd.value_of(IDE_SERVICE_NAME_ARGUMENT_NAME)
@@ -149,13 +149,13 @@ fn main() {
true => Some(v.to_owned()),
_ => Some(format!("{}.service",v))
}).unwrap();
let unit_folder = system_cmd.value_of(SYSTEMD_UNIT_FOLDER_ARGUMENT_NAME).unwrap();
let unit_folder = system_cmd.value_of(SYSTEMD_UNIT_FOLDER_ARGUMENT_NAME).unwrap();
let service_file= shellexpand::full(&format!("{}/{}", unit_folder, ide_service_name))
.and_then(|v| Ok(String::from(v))).unwrap();
let clean_service_file= shellexpand::full(&format!("{}/clean-{}", unit_folder, ide_service_name))
.and_then(|v| Ok(String::from(v))).unwrap();
match system_cmd.subcommand() {
(UNINSTALL_SUBCOMMAND_NAME, _ ) => {
(UNINSTALL_SUBCOMMAND_NAME, _ ) => {
fs::remove_file(&service_file).expect(&format!("could remove service file {}", service_file));
fs::remove_file(&clean_service_file).expect(&format!("could remove service file {}", clean_service_file));
},
@@ -165,7 +165,7 @@ fn main() {
let args = install_cmd.value_of(START_ARGS_ARGUMENT_NAME).unwrap();
let create_service_script = format!("create_service_file.sh {}", ide_service_name);
let nix_expression = format!("with import <nixpkgs> {{}}; callPackage {} {}", file, args);
let nix_expression = format!("with import <nixpkgs> {{}}; callPackage {} {}", file, args);
Command::new("nix-shell")
.stderr(Stdio::null())
.stdout(Stdio::null())
@@ -181,7 +181,7 @@ fn main() {
if force {
mv_cmd.arg("--force");
}
mv_cmd.arg(&format!("{}.service", ide_service_name))
.arg(service_file)
.output()
@@ -198,8 +198,8 @@ fn main() {
println!("{}", ide_service_name);
},
_ => {}
}
}
}
}
_ => println!("-1")
};
}