From c79bb68270abd6e5a59e36bf09d64b2eb0d23fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Thu, 25 Apr 2019 19:41:41 +0200
Subject: Add makefile and remove nixops dependency

---
 nixops/scripts/pull_deployment | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'nixops/scripts/pull_deployment')

diff --git a/nixops/scripts/pull_deployment b/nixops/scripts/pull_deployment
index 8ee9b75..d238434 100755
--- a/nixops/scripts/pull_deployment
+++ b/nixops/scripts/pull_deployment
@@ -8,16 +8,17 @@ if [ -z "$NIXOPS_CONFIG_PASS_SUBTREE_PATH" ]; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+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
+if $nixops 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 delete --force -d $DeploymentUuid
   else
     echo "Aborting"
     exit 1
@@ -26,6 +27,6 @@ fi
 
 deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
 
-echo "$deployment" | nixops import
+echo "$deployment" | $nixops import
 
-nixops modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"
+$nixops modify -d "$DeploymentUuid" "$(dirname $DIR)/eldiron.nix"
-- 
cgit v1.2.3