Fix scripts environment and upgrade nixops

4 files changed, 11 insertions, 13 deletions

diff --git a/nix_path_env b/nix_path_env
index bd976b6..0a57f10 100644
--- a/nix_path_env
+++ b/nix_path_env
@@ -4,7 +4,7 @@ if [ -z "$NIXOPS_DEPLOYMENT" ]; then
   # This will automatically upgrade to latest version at each build
   nixpkgs="https://nixos.org/channels/nixos-19.03/nixexprs.tar.xz"
 else
-  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172361.cf3e277dd0b/nixexprs.tar.xz"
+  nixpkgs="https://releases.nixos.org/nixos/19.03/nixos-19.03.172396.d740b2ee855/nixexprs.tar.xz"
 fi
 nixpkgsPrevious="$nixpkgs"
 nixpkgsNext="$nixpkgs"
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/^.* //')
 
diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index 2fc07bc..bc4a999 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -1,15 +1,16 @@
 #!/bin/bash
 
 DeploymentUuid="cef694f3-081d-11e9-b31f-0242ec186adf"
-
 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"
+
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
 if $nixops info -d $DeploymentUuid 2>/dev/null >/dev/null; then
diff --git a/nixops/scripts/push_deployment b/nixops/scripts/push_deployment
index c8c34ee..067b665 100755
--- a/nixops/scripts/push_deployment
+++ b/nixops/scripts/push_deployment
@@ -1,16 +1,14 @@
 #!/bin/bash
 
 DeploymentUuid="cef694f3-081d-11e9-b31f-0242ec186adf"
-
 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 )"
-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"
+source $(dirname $(dirname $DIR))/nix_path_env
+nixops="$(nix-build --no-out-link -A nixops "$(dirname $(dirname $DIR))")/bin/nixops"
 
 $nixops export | pass insert -m $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment