X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fpull_deployment;h=08b99159c619ea686ffe64c217dec9508238c627;hb=2232653330cedd11ac2aa64bdac994137cb26e80;hp=bc4a999f392320a690cc87013d4d98f49ac303f4;hpb=95d4a7a0dc38282c994789883be509225fbc9fa4;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index bc4a999..08b9915 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -8,19 +8,18 @@ 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"
+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
@@ -29,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)/default.nix"