free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ignore completion file when installing on mesh

This commit is contained in:
Bob Mottram 2016-07-17 16:46:49 +01:00
parent 72a47da79a
commit f2165a7879
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/freedombone-app-tox
View File

@ -189,11 +189,14 @@ function remove_tox {
} }
function configure_firewall_for_tox { function configure_firewall_for_tox {
if [ -f $COMPLETION_FILE ]; then if [ ! $INSTALLING_MESH ]; then
if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then if [ -f $COMPLETION_FILE ]; then
return if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
return
fi
fi fi
fi fi
if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
# docker does its own firewalling # docker does its own firewalling
return return
@ -519,8 +522,10 @@ function enable_tox_repo {
} }
function install_tox { function install_tox {
if grep -Fxq "install_tox" $COMPLETION_FILE; then if [ ! $INSTALLING_MESH ]; then
return if grep -Fxq "install_tox" $COMPLETION_FILE; then
return
fi
fi fi
configure_firewall_for_tox configure_firewall_for_tox