From 95d4a7a0dc38282c994789883be509225fbc9fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 2 May 2019 01:06:19 +0200 Subject: Fix scripts environment and upgrade nixops --- nixops/scripts/nixops_wrap | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'nixops/scripts/nixops_wrap') diff --git a/nixops/scripts/nixops_wrap b/nixops/scripts/nixops_wrap index e50b246..12f661a 100755 --- a/nixops/scripts/nixops_wrap +++ b/nixops/scripts/nixops_wrap @@ -5,16 +5,18 @@ if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then echo "Please set NIXOPS_CONFIG_PASS_SUBTREE_PATH to the password-store subtree path" exit 1; fi +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" +export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" +export NIXOPS_DEPLOYMENT="$DeploymentUuid" +source $(dirname $(dirname $DIR))/nix_path_env +nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops" 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() { rm -rf "$TEMP" @@ -23,9 +25,6 @@ finish() { trap finish EXIT -export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops" -export NIXOPS_DEPLOYMENT="$DeploymentUuid" - # pass cannot "just" list files in a directory without showing a tree :( files=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/files | sed -e '1d' -e 's/^.* //') -- cgit v1.2.3