Skip to content

Remove trailing whitespace and add missing newlines at EOF #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Remove trailing whitespace and add missing newlines at EOF #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/darwin/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ SPDX-License-Identifier: MPL-2.0

## Deploying

Run `nix run github:serokell/deploy-rs -- --ssh-user <user>`.
Run `nix run github:serokell/deploy-rs -- --ssh-user <user>`.
2 changes: 1 addition & 1 deletion examples/system/nix-pub.pem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cache.example.com:ic28PY7OIOQtoU282iaiizvA5WIOtYx5h6c9ePn3hDQ=
cache.example.com:ic28PY7OIOQtoU282iaiizvA5WIOtYx5h6c9ePn3hDQ=
2 changes: 1 addition & 1 deletion examples/system/nix.key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cache.example.com:dPNdwv04QPIEpcWnGioZmX9dvaGe7GCo7BZJFymDBnSJzbw9js4g5C2hTbzaJqKLO8DlYg61jHmHpz14+feENA==
cache.example.com:dPNdwv04QPIEpcWnGioZmX9dvaGe7GCo7BZJFymDBnSJzbw9js4g5C2hTbzaJqKLO8DlYg61jHmHpz14+feENA==
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
cargoLock.lockFile = ./Cargo.lock;

meta = {
description = "A Simple multi-profile Nix-flake deploy tool";
description = "A Simple multi-profile Nix-flake deploy tool";
mainProgram = "deploy";
};
};
Expand Down
6 changes: 3 additions & 3 deletions src/deploy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ pub async fn confirm_profile(
.arg(confirm_command)
.spawn()
.map_err(ConfirmProfileError::SSHConfirm)?;

if deploy_data.merged_settings.interactive_sudo.unwrap_or(false) {
trace!("[confirm] Piping in sudo password");
handle_sudo_stdin(&mut ssh_confirm_child, deploy_defs)
Expand All @@ -311,7 +311,7 @@ pub async fn confirm_profile(
let ssh_confirm_exit_status = ssh_confirm_child
.wait()
.await
.map_err(ConfirmProfileError::SSHConfirm)?;
.map_err(ConfirmProfileError::SSHConfirm)?;

match ssh_confirm_exit_status.code() {
Some(0) => (),
Expand Down Expand Up @@ -467,7 +467,7 @@ pub async fn deploy_profile(
ssh_wait_command
.arg(&ssh_addr)
.stdin(std::process::Stdio::piped());

for ssh_opt in &deploy_data.merged_settings.ssh_opts {
ssh_wait_command.arg(ssh_opt);
}
Expand Down