From e61d3dcbbd1a1988eae337a024160750696fa36d Mon Sep 17 00:00:00 2001 From: Carl Andersson Date: Mon, 13 Oct 2025 18:29:14 +0200 Subject: [PATCH] Fix double success reporting --- kluctl.nix | 2 +- validation.nix | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kluctl.nix b/kluctl.nix index 2a0a73a..4849bac 100644 --- a/kluctl.nix +++ b/kluctl.nix @@ -159,7 +159,7 @@ in for i in (seq ${cfg.retryCount}) $command && begin - echo "Success!" + echo "Great success!" exit 0 end end diff --git a/validation.nix b/validation.nix index e3956c1..6a100cd 100644 --- a/validation.nix +++ b/validation.nix @@ -50,7 +50,7 @@ in script = pkgs.writeScriptBin "kubeval" # fish '' - #! ${pkgs.fishMinimal}/bin/fish + #! ${lib.getExe pkgs.fishMinimal} set --prepend PATH ${cfg.etcdPackage}/bin set --prepend PATH ${cfg.kubernetesPackage}/bin set --prepend PATH ${pkgs.retry}/bin @@ -152,8 +152,7 @@ in echo "kube-apiserver ready; applying manifest(s)" - ${lib.getExe config.kluctl.script} --yes --no-wait && echo "Great success!" - + ${lib.getExe config.kluctl.script} --yes --no-wait exit $status ''; };