From a9db1455f57a5848fa3aa58e3891d3083252700f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 13 Mar 2024 18:37:28 +0200 Subject: refactor(ops/terraform/deploy-nixos): downcase bash variables These are not environment variables, so let's shout less. Change-Id: I3132844937ee78b7230a46afc0240e0225a99f3e Reviewed-on: https://cl.tvl.fyi/c/depot/+/11140 Reviewed-by: tazjin Tested-by: BuildkiteCI Autosubmit: flokli --- ops/terraform/deploy-nixos/nixos-eval.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'ops/terraform') diff --git a/ops/terraform/deploy-nixos/nixos-eval.sh b/ops/terraform/deploy-nixos/nixos-eval.sh index 0b645daeb59b..dbc03d2fecf5 100755 --- a/ops/terraform/deploy-nixos/nixos-eval.sh +++ b/ops/terraform/deploy-nixos/nixos-eval.sh @@ -10,11 +10,12 @@ set -ueo pipefail # Load input variables from Terraform. jq's @sh format takes care of # escaping. -eval "$(jq -r '@sh "ATTRPATH=\(.attrpath) && ENTRYPOINT=\(.entrypoint)"')" +eval "$(jq -r '@sh "attrpath=\(.attrpath) && entrypoint=\(.entrypoint)"')" # Evaluate the system derivation. -[[ -z "$ENTRYPOINT" ]] && ENTRYPOINT=$(git rev-parse --show-toplevel) -SYSTEM_DRV=$(nix-instantiate -A "${ATTRPATH}" "${ENTRYPOINT}") +[[ -z "$entrypoint" ]] && entrypoint=$(git rev-parse --show-toplevel) +# shellcheck disable=SC2154 +system_drv=$(nix-instantiate -A "${attrpath}" "${entrypoint}") # Return system derivation back to Terraform. -jq -n --arg drv "$SYSTEM_DRV" '{"drv":$drv}' +jq -n --arg drv "$system_drv" '{"drv":$drv}' -- cgit 1.4.1