From 1a2d0baddea808f59dd8a6f816b008860551727d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krist=C3=B3f=20T=C3=B3th?= <kristof.toth@avatao.com>
Date: Sat, 31 Mar 2018 19:19:16 +0200
Subject: [PATCH] Move frontend directory inside test project for content
 creators

---
 hack/bootstrap_tfw_dev.sh | 17 +++++++++++------
 hack/oneline_install.sh   |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/hack/bootstrap_tfw_dev.sh b/hack/bootstrap_tfw_dev.sh
index c4c44ef..d816654 100755
--- a/hack/bootstrap_tfw_dev.sh
+++ b/hack/bootstrap_tfw_dev.sh
@@ -22,20 +22,25 @@ echo -n "test... " && git clone git@github.com:avatao-content/${TEST}.git >> $LO
 echo "Done!"
 echo
 
+echo -n "Installing frontend dependencies... "
+cd ${FRONTEND}
+yarn install >> $LOGFILE 2>&1
+cd ..
+echo "Done!"
+
 if [ -z "$TFWDEV" ]; then
     TFWURL=https://registry.hub.docker.com/v1/repositories/avatao/tutorial-framework/tags
     PYTHON_PARSEJSON="import sys, json; print json.load(sys.stdin)[-1]['name']"
     LATESTTAG="$(curl -fsSL ${TFWURL} | python -c "${PYTHON_PARSEJSON}")"
     $sed_cmd -i "1 s/.*/&:${LATESTTAG}/" "${TEST}/solvable/Dockerfile"
+
     rm -rf "${TEST}/.git"
     rm -rf "${FRONTEND}/.git"
+
+    NESTED_FRONTEND="${TEST}/solvable/frontend"
+    rm -rf $NESTED_FRONTEND
+    mv "$FRONTEND" "$NESTED_FRONTEND"
 fi
 
-echo -n "Installing frontend dependencies... "
-cd ${FRONTEND}
-yarn install >> $LOGFILE 2>&1
-
-wait
-echo "Done!"
 echo 
 echo "You can build & start TFW by executing the command: ${TEST}/hack/tfw.sh buildstart"
diff --git a/hack/oneline_install.sh b/hack/oneline_install.sh
index 6fc582f..d102197 100644
--- a/hack/oneline_install.sh
+++ b/hack/oneline_install.sh
@@ -1 +1 @@
-URL=https://git.io/vxBfj SHA=9e6d121bc6cff930a252d00df501a84adbef4df3a0979dddf13949f35ec49006 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=0eaefa81b66f56a5607e4bfe05614f2c6f4a939394716bf9059d32f313a49d6e bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'