Nickiel/nicks_nextcloud_integrations
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up codebase, use patch in hddtemp Nix store path #1

Merged
Nickiel merged 9 commits from ElnuDev/nicks_nextcloud_integrations:main into main 2023-08-26 12:46:03 -07:00
Conversation 0 Commits 9 Files changed 2 +5 -5
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 54c63e8cf4 - Show all commits

5
flake.nix
View file

@ -63,6 +63,9 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
version = "0.1.0";
buildAndTestSubdir = "status_cloud";
cargoHash = "sha256-mMxHI/rU1Gd5UR+hZ+5+FnBrff8uF+SrEvGJT7wh5tI=";
preBuild = ''
sed -i 's/Command::new("hddtemp")/${nixpkgs.lib.escape [ "/" ] "Command::new(\"${pkgs.hddtemp}\")"}/g' status_cloud/src/main.rs
'';
meta = meta // {
description = "Server status saved to a nextcloud note service.";
};
@ -104,7 +107,7 @@ rust-project TODO: write shell script for automatically updating `cargoHash`
serviceConfig = {
Type = "oneshot";
ExecStart = ''
${cfg.package}/bin/status_cloud --hddtemp-executable ${pkgs.hddtemp}/bin/hddtemp --config-file ${builtins.toString cfg.config_path}
${cfg.package}/bin/status_cloud --config-file ${builtins.toString cfg.config_path}
'';
};
};

5
status_cloud/src/main.rs
View file

@ -63,7 +63,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut drive_temps: Vec<String> = vec![];
for drive in drives {
let output = match Command::new(&args.hddtemp_executable)
let output = match Command::new("hddtemp")
.arg("--unit=F")
.arg(&drive)
.output()
@ -137,9 +137,6 @@ struct CliArgs {
#[arg(short, long)]
config_file: PathBuf,
#[arg(short, long)]
hddtemp_executable: String,
#[arg(short, long)]
debug: bool,
}