X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=nixops%2Fscripts%2Fsetup;h=cfa8d64092365c3e513b86201fb9c3dac1ac920d;hb=c79bb68270abd6e5a59e36bf09d64b2eb0d23fb8;hp=81ba8aa2f2569532b8c293c79a8b002bfe7da771;hpb=d07d139ae42fb2c4263c96167ca6ca67f562bbe9;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 81ba8aa..cfa8d64 100755
--- a/nixops/scripts/setup
+++ b/nixops/scripts/setup
@@ -52,6 +52,9 @@ if ! pass $NIXOPS_CONFIG_PASS_SUBTREE_PATH > /dev/null 2>/dev/null; then
   fi
 fi
 
+# Repull it before using it, just in case
+pass git subtree pull --prefix=$NIXOPS_CONFIG_PASS_SUBTREE_PATH $NIXOPS_CONFIG_PASS_SUBTREE_REMOTE master
+
 gpg_keys=$(pass ls $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/GPGKeys | sed -e "1d" | cut -d" " -f2)
 for key in $gpg_keys; do
   content=$(pass show $NIXOPS_CONFIG_PASS_SUBTREE_PATH/Nixops/GPGKeys/$key)
@@ -131,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]
@@ -163,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