Fixed paths in getenvsetup script | refs #32734

tools/getenvsetup.sh

@@ -37,21 +37,21 @@ if [ "$proxy" ]; then
     git config --global http.proxy "$proxy"
     echo "HTTP_PROXY=\"http://$proxy\"" >> /etc/environment
     echo "HTTPS_PROXY=\"http://$proxy\"" >> /etc/environment
+    source /etc/environment
 fi
 
 # clone envsetup
+cd /root
 git clone https://mirismanager.ubicast.eu/git/mediaserver/envsetup.git -b stable
 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,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
+    cp -u /root/envsetup/ansible/inventories/local-${target}/host_vars/localhost.{dist.yml,yml}
+    sed -i "s/skyreach_activation_key:.*/skyreach_activation_key: ${key}/g" /root/envsetup/ansible/inventories/local-${target}/host_vars/localhost.yml
 fi
 
 # deploy target
 make install
-make deploy i=inventories/local-${target}
+make deploy i=/root/envsetup/ansible/inventories/local-${target}