From 11234d0798eeb56b2a09bfc66925e782ace465e3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Sat, 27 Apr 2019 14:36:33 +0200
Subject: [PATCH] Source environemnt before building nixops in scripts

---
 nixops/scripts/nixops_wrap     | 7 ++++---
 nixops/scripts/pull_deployment | 1 +
 nixops/scripts/push_deployment | 1 +
 nixops/scripts/setup           | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap
index e4f5dc5..e50b246 100755
--- a/nixops/scripts/nixops_wrap
+++ b/nixops/scripts/nixops_wrap
@@ -10,6 +10,10 @@ TEMP=$(mktemp -d /tmp/XXXXXX-nixops-files)
 chmod go-rwx $TEMP
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $(dirname $(dirname $DIR))/nix_path_env
+# __noChroot: ssh-config-file requires relaxed
+export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
+
 nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
 
 finish() {
@@ -30,7 +34,4 @@ for file in $files; do
 done
 $nixops set-args --argstr privateFiles "$TEMP"
 
-source $(dirname $(dirname $DIR))/nix_path_env
-# __noChroot: ssh-config-file requires relaxed
-export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH"
 $nixops "$@"
diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index d238434..2fc07bc 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -8,6 +8,7 @@ if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $(dirname $(dirname $DIR))/nix_path_env
 nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
index 73084e4..c8c34ee 100755
--- a/nixops/scripts/push_deployment
+++ b/nixops/scripts/push_deployment
@@ -8,6 +8,7 @@ if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $(dirname $(dirname $DIR))/nix_path_env
 nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index cfa8d64..55dd9d9 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -135,6 +135,7 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+source $(dirname $(dirname $DIR))/nix_path_env
 nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
-- 
2.41.0