Skip to content
Snippets Groups Projects
Commit f2165a78 authored by Bob Mottram's avatar Bob Mottram
Browse files

Ignore completion file when installing on mesh

parent 72a47da7
No related branches found
No related tags found
No related merge requests found
......@@ -189,11 +189,14 @@ function remove_tox {
}
function configure_firewall_for_tox {
if [ -f $COMPLETION_FILE ]; then
if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
return
if [ ! $INSTALLING_MESH ]; then
if [ -f $COMPLETION_FILE ]; then
if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
return
fi
fi
fi
if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
# docker does its own firewalling
return
......@@ -519,8 +522,10 @@ function enable_tox_repo {
}
function install_tox {
if grep -Fxq "install_tox" $COMPLETION_FILE; then
return
if [ ! $INSTALLING_MESH ]; then
if grep -Fxq "install_tox" $COMPLETION_FILE; then
return
fi
fi
configure_firewall_for_tox
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment