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/setup | 27 ++++-----------------------
 1 file changed, 4 insertions(+), 23 deletions(-)

(limited to 'nixops/scripts/setup')

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 4a76d35..cfa8d64 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -134,31 +134,12 @@ if nix show-config --json | jq -e '.sandbox.value == "true"' >/dev/null; then
   exit 1
 fi
 
-if ! which nixops 2>/dev/null >/dev/null; then
-  cat <<-EOF
-	nixops is needed:
-	> nix-env -i nixops
-	If it fails, please check that $HOME/.nix-profile/bin is in your PATH.
-	Continue? [y/N]
-	EOF
-  read y
-  if [ "$y" = "y" -o "$y" = "Y" ]; then
-    nix-env -i nixops
-    if ! which nixops 2>/dev/null >/dev/null; then
-      echo "Installation failed, please check that $HOME/.nix-profile/bin is in your path."
-      exit 1
-    fi
-  else
-    echo "Aborting"
-    exit 1
-  fi
-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"
 export NIXOPS_DEPLOYMENT="$DeploymentUuid"
 
-if ! nixops info 2>/dev/null >/dev/null; then
+if ! $nixops info 2>/dev/null >/dev/null; then
   cat <<-EOF
 	Importing deployment file into nixops:
 	Continue? [y/N]
@@ -166,9 +147,9 @@ if ! nixops info 2>/dev/null >/dev/null; then
   read y
   if [ "$y" = "y" -o "$y" = "Y" ]; then
     deployment=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/Deployment)
-    echo "$deployment" | nixops import
+    echo "$deployment" | $nixops import
 
-    nixops modify "$(dirname $DIR)/eldiron.nix"
+    $nixops modify "$(dirname $DIR)/eldiron.nix"
   else
     echo "Aborting"
     exit 1
-- 
cgit v1.2.3