From d536eb5656922a90942fe026598f8c12bd7a2c35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sun, 30 Jul 2023 08:56:38 +0300 Subject: [PATCH] set OLD_PATH once --- modules/services/deployerbot/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/services/deployerbot/default.nix b/modules/services/deployerbot/default.nix index 9113706..ef9cd58 100644 --- a/modules/services/deployerbot/default.nix +++ b/modules/services/deployerbot/default.nix @@ -45,6 +45,7 @@ deployDerivationsStr = builtins.concatStringsSep " " deployDerivations; in '' set -x + OLD_PATH=$PATH export GIT_SSH_COMMAND="${pkgs.openssh}/bin/ssh -i ''${CREDENTIALS_DIRECTORY}/ssh-key" if [[ ! -d config ]]; then ${pkgs.git}/bin/git clone ${repo} config @@ -55,12 +56,10 @@ ${pkgs.git}/bin/git reset --hard origin/main fi - OLD_PATH=$PATH export PATH=$PATH:${pkgs.git}/bin ${pkgs.nix}/bin/nix flake update --accept-flake-config --commit-lock-file export PATH=$OLD_PATH - OLD_PATH=$PATH export PATH=$PATH:${pkgs.git}/bin:${pkgs.openssh}/bin:${pkgs.nix}/bin exec ${pkgs.nix}/bin/nix run .#deploy-rs -- \ --ssh-opts="-i ''${CREDENTIALS_DIRECTORY}/ssh-key" \