diff options
Diffstat (limited to 'nixops/scripts/nixops_wrap')
-rwxr-xr-x | nixops/scripts/nixops_wrap | 7 |
1 files changed, 4 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) | |||
10 | chmod go-rwx $TEMP | 10 | chmod go-rwx $TEMP |
11 | 11 | ||
12 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" | 12 | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" |
13 | source $(dirname $(dirname $DIR))/nix_path_env | ||
14 | # __noChroot: ssh-config-file requires relaxed | ||
15 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH" | ||
16 | |||
13 | nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" | 17 | nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" |
14 | 18 | ||
15 | finish() { | 19 | finish() { |
@@ -30,7 +34,4 @@ for file in $files; do | |||
30 | done | 34 | done |
31 | $nixops set-args --argstr privateFiles "$TEMP" | 35 | $nixops set-args --argstr privateFiles "$TEMP" |
32 | 36 | ||
33 | source $(dirname $(dirname $DIR))/nix_path_env | ||
34 | # __noChroot: ssh-config-file requires relaxed | ||
35 | export NIX_PATH="ssh-config-file=$(dirname $DIR)/ssh/config:$NIX_PATH" | ||
36 | $nixops "$@" | 37 | $nixops "$@" |