From 9f2f5f8bfb9d1240af5f368283f62a26d5121f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Wed, 30 May 2018 17:21:21 +0200
Subject: [PATCH] Build TFW for framework developers and reorder building
 process

---
 hack/bootstrap_tfw_dev.sh | 16 ++++++++--------
 hack/oneline_install.sh   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh
index e362feb..e1bd99a 100755
--- a/hack/bootstrap_tfw_dev.sh
+++ b/hack/bootstrap_tfw_dev.sh
@@ -27,11 +27,11 @@ run()
 
     check_dependencies
     clone_repos_ask_ssh_or_https
+    TAG="$(fetch_latest_tag)"
+    TAG=$TAG pin_latest_baseimage
+    TAG=$TAG build_latest_baseimage
     install_frontend_deps
     if [ "$TFWDEV" == "0" ]; then
-        LATESTTAG="$(fetch_latest_tag)"
-        LATESTTAG=$LATESTTAG pin_latest_baseimage
-        LATESTTAG=$LATESTTAG build_latest_baseimage
         cleanup_repos
         merge_repos
     fi
@@ -123,18 +123,18 @@ fetch_latest_tag()
 pin_latest_baseimage()
 {
     echo -n "Pinning latest TFW baseimage version... "
-    echo -n "which is ${LATESTTAG}... "
-    sed -i "1 s/.*/&:${LATESTTAG}/" "${TEST}/solvable/Dockerfile"
+    echo -n "which is ${TAG}... "
+    sed -i "1 s/.*/&:${TAG}/" "${TEST}/solvable/Dockerfile"
     echo "Done!"
 }
 
 build_latest_baseimage()
 {
-    echo -n "Building baseimage at ${LATESTTAG}... "
+    echo -n "Building baseimage at ${TAG}... "
     pushd "$BASEIMAGE"
-    spinned logged git checkout "$LATESTTAG"
+    spinned logged git checkout "$TAG"
     popd
-    TFWTAG=$LATESTTAG spinned logged ${TEST}/hack/tfw.sh buildtfw
+    TFWTAG=$TAG spinned logged ${TEST}/hack/tfw.sh buildtfw
     echo "Done!"
 }
 
diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh
index 3ae957a..a8963e9 100644
--- a/hack/oneline_install.sh
+++ b/hack/oneline_install.sh
@@ -1 +1 @@
-URL=https://git.io/vxBfj SHA=e16ddb440c0097521739067dd21312eadcb3a008e6982aaa1a052fe5ed35b1bc bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'
+URL=https://git.io/vxBfj SHA=237d0cce945574208784a21fa6c6fbb4f479e5ce60b1518b1fcc921d675d2861 bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'