Browse Source

Ignore completion file when installing on mesh

Bob Mottram 9 years ago
parent
commit
f2165a7879
1 changed files with 10 additions and 5 deletions
  1. 10
    5
      src/freedombone-app-tox

+ 10
- 5
src/freedombone-app-tox View File

@@ -189,11 +189,14 @@ function remove_tox {
189 189
 }
190 190
 
191 191
 function configure_firewall_for_tox {
192
-	if [ -f $COMPLETION_FILE ]; then
193
-		if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
194
-			return
192
+	if [ ! $INSTALLING_MESH ]; then
193
+		if [ -f $COMPLETION_FILE ]; then
194
+			if grep -Fxq "configure_firewall_for_tox" $COMPLETION_FILE; then
195
+				return
196
+			fi
195 197
 		fi
196 198
 	fi
199
+
197 200
 	if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
198 201
 		# docker does its own firewalling
199 202
 		return
@@ -519,8 +522,10 @@ function enable_tox_repo {
519 522
 }
520 523
 
521 524
 function install_tox {
522
-	if grep -Fxq "install_tox" $COMPLETION_FILE; then
523
-		return
525
+	if [ ! $INSTALLING_MESH ]; then
526
+		if grep -Fxq "install_tox" $COMPLETION_FILE; then
527
+			return
528
+		fi
524 529
 	fi
525 530
 
526 531
 	configure_firewall_for_tox