From 9434dbab9ab7accd4273dc948cbb8019a8206b8a Mon Sep 17 00:00:00 2001
From: Nicolas KAROLAK <nicolas@karolak.fr>
Date: Thu, 26 Mar 2020 14:45:34 +0000
Subject: [PATCH] temp fix waiting for merge into stable
---
getenvsetup.sh | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/getenvsetup.sh b/getenvsetup.sh
index 538fbae5..145af743 100755
--- a/getenvsetup.sh
+++ b/getenvsetup.sh
@@ -46,10 +46,12 @@ cd /root/envsetup || exit
# activation key
read -r -p "Activation key (e.g. XXX-XXX-XXX-XXX): " key
if [ "$key" ]; then
- cp -u /root/envsetup/inventories/local-${target}/host_vars/localhost.dist.yml /root/envsetup/inventories/local-${target}/host_vars/localhost.yml
+ cp -u /root/envsetup/inventories/local-${target}/host_vars/localhost.{dist.yml,yml}
+ # temp fix while waiting for envsetup3 to be merged into stable
+ test -f site.yml || git checkout master
sed -i "s/skyreach_activation_key:.*/skyreach_activation_key: ${key}/g" /root/envsetup/inventories/local-${target}/host_vars/localhost.yml
fi
# deploy target
-make requirements
+make install
make deploy i=inventories/local-${target}
--
GitLab