From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sat, 20 Apr 2019 07:07:08 +0000 (+0200)
Subject: Refresh environment before using it in setup
X-Git-Tag: nur_publish~129
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FNix.git;a=commitdiff_plain;h=b9c11a4dfd5afab304503fd61efe773b5a0da6a7

Refresh environment before using it in setup
---

diff --git a/nixops/scripts/setup b/nixops/scripts/setup
index 81ba8aa..4a76d35 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)