Skip to content

Commit

Permalink
chore: fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
a-kenji committed Aug 22, 2023
1 parent de6f5c7 commit 2d0586b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions src/nixos-anywhere.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Options:
* --post-kexec-ssh-port <ssh_port>
after kexec is executed, use a custom ssh port to connect. Defaults to 22
* --stop-after-disko
exit after disko formating, you can then proceed to install manually or some other way
exit after disko formatting, you can then proceed to install manually or some other way
* --extra-files <file...>
files to copy into the new nixos installation
* --disk-encryption-keys <remote_path> <local_path>
Expand Down Expand Up @@ -262,7 +262,7 @@ if [[ -n ${ssh_private_key_file-} ]]; then
ssh_copy_id_args+=(-f)
fi

ssh_settings=$(ssh -G "${ssh_connection}")
ssh_settings=$(ssh -G "$ssh_connection")
ssh_host=$(echo "$ssh_settings" | awk '/^hostname / { print $2 }')
ssh_port=$(echo "$ssh_settings" | awk '/^port / { print $2 }')

Expand Down Expand Up @@ -311,7 +311,7 @@ SSH
fi
# make facts available in script
# shellcheck disable=SC2046
export $(echo "$filtered_facts" | xargs)
export "$(echo "$filtered_facts" | xargs)"
}

step Gathering machine facts
Expand Down Expand Up @@ -360,7 +360,7 @@ SSH
elif [[ ${has_wget-n} == "y" ]]; then
ssh_ "wget '${kexec_url}' -O- | ${maybe_sudo} tar -C /root/kexec -xvzf-"
else
curl --fail -Ss -L "${kexec_url}" | ssh_ "${maybe_sudo} tar -C /root/kexec -xvzf-"
curl --fail -Ss -L "$kexec_url" | ssh_ "${maybe_sudo} tar -C /root/kexec -xvzf-"
fi

ssh_ <<SSH
Expand Down
6 changes: 3 additions & 3 deletions terraform/all-in-one/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ variable "kexec_tarball_url" {
default = null
}

# To make this re-usuable we maybe should accept a store path here?
# To make this re-usable we maybe should accept a store path here?
variable "nixos_partitioner_attr" {
type = string
description = "Nixos partitioner and mount script i.e. your-flake#nixosConfigurations.your-evaluated-nixos.config.system.build.diskoNoDeps or just your-evaluated.config.system.build.diskNoDeps. `config.system.build.diskNoDeps` is provided by the disko nixos module"
}

# To make this re-usuable we maybe should accept a store path here?
# To make this re-usable we maybe should accept a store path here?
variable "nixos_system_attr" {
type = string
description = "The nixos system to deploy i.e. your-flake#nixosConfigurations.your-evaluated-nixos.config.system.build.toplevel or just your-evaluated-nixos.config.system.build.toplevel if you are not using flakes"
Expand Down Expand Up @@ -71,6 +71,6 @@ variable "debug_logging" {

variable "stop_after_disko" {
type = bool
description = "Exit after disko formating"
description = "Exit after disko formatting"
default = false
}
6 changes: 3 additions & 3 deletions terraform/install/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ variable "kexec_tarball_url" {
default = null
}

# To make this re-usuable we maybe should accept a store path here?
# To make this re-usable we maybe should accept a store path here?
variable "nixos_partitioner" {
type = string
description = "nixos partitioner and mount script"
}

# To make this re-usuable we maybe should accept a store path here?
# To make this re-usable we maybe should accept a store path here?
variable "nixos_system" {
type = string
description = "The nixos system to deploy"
Expand Down Expand Up @@ -53,6 +53,6 @@ variable "debug_logging" {

variable "stop_after_disko" {
type = bool
description = "Exit after disko formating"
description = "Exit after disko formatting"
default = false
}

0 comments on commit 2d0586b

Please sign in to comment.