X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fpull_deployment;h=2f5087553ae98f07700322c7ccbaf1432bb68ed2;hb=dbcba2ea2b7301aaa7e6487c2589b09ef09ba066;hp=2fc07bc4a1d8e0e6e8d340b2167d1671fd32082c;hpb=11234d0798eeb56b2a09bfc66925e782ace465e3;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index 2fc07bc..2f50875 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -1,25 +1,25 @@
 #!/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))/scripts/nix_env
+
 export NIXOPS_STATE="$(dirname $DIR)/state/eldiron.nixops"
 
-if $nixops info -d $DeploymentUuid 2>/dev/null >/dev/null; then
+if nixops_custom info -d $DeploymentUuid 2>/dev/null >/dev/null; then
   cat <<EOF
 This will remove your current deployment file and recreate it!
 Continue? [y/N]
 EOF
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
-    $nixops delete --force -d $DeploymentUuid
+    nixops_custom delete --force -d $DeploymentUuid
   else
     echo "Aborting"
     exit 1
@@ -28,6 +28,6 @@ fi
 
 deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
 
-echo "$deployment" | $nixops import
+echo "$deployment" | nixops_custom import
 
-$nixops modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"
+nixops_custom modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"