浏览代码

Ignore completion file when installing on mesh

Bob Mottram 9 年前
父节点
当前提交
f2165a7879
共有 1 个文件被更改,包括 10 次插入5 次删除
  1. 10
    5
      src/freedombone-app-tox

+ 10
- 5
src/freedombone-app-tox 查看文件

189
 }
189
 }
190
 
190
 
191
 function configure_firewall_for_tox {
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
 		fi
197
 		fi
196
 	fi
198
 	fi
199
+
197
 	if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
200
 	if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
198
 		# docker does its own firewalling
201
 		# docker does its own firewalling
199
 		return
202
 		return
519
 }
522
 }
520
 
523
 
521
 function install_tox {
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
 	fi
529
 	fi
525
 
530
 
526
 	configure_firewall_for_tox
531
 	configure_firewall_for_tox