mrtoth
/
test-tutorial-framework
mirror of https://github.com/avatao-content/test-tutorial-framework
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix cleanup trap failing when not in proper directory

This commit is contained in:
Kristóf Tóth 2018-04-27 11:28:00 +02:00
parent adcdf74673
commit 6c90801146
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hack/bootstrap_tfw_dev.sh
View File

@ -10,6 +10,7 @@ popd() { command popd "$@" > /dev/null; }
TFWDEV="${TFWDEV:-0}"
TFW_POSTFIX=tutorial-framework
BASEDIR="$(pwd)"
BASEIMAGE=baseimage-${TFW_POSTFIX}
TEST=test-${TFW_POSTFIX}
FRONTEND=frontend-${TFW_POSTFIX}
@ -39,7 +40,7 @@ run()
showlog() { echo && echo "Error! Showing logs:" && cat $LOGFILE; }
cleanlog() { rm $LOGFILE; }
err_cleanup() { rm -rf "$BASEIMAGE" "$FRONTEND" "$TEST"; }
err_cleanup() { cd "$BASEDIR" && rm -rf "$BASEIMAGE" "$FRONTEND" "$TEST"; }
clone_repos()
{

2
hack/oneline_install.sh
View File

@ -1 +1 @@
URL=https://git.io/vxBfj SHA=40cf2fec4e9d378dd8a4f049fd6ba7b7c415bf699e0a6e329ec8e3cf3f5d383c 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=18a2be757b6367c725aaaa1706c12aacf81684e49c3d911c6fa1f59a9ed996da bash -c 'cmd="$(curl -fsSL $URL)" && [ $(echo "$cmd" | sha256sum | cut -d " " -f1) == $SHA ] && echo "$cmd" | bash || echo Checksum mismatch!'