Ver código fonte

Remove some annoying variant boilerplate

Bob Mottram 8 anos atrás
pai
commit
6290387734

+ 0
- 3
src/freedombone-app-blog Ver arquivo

@@ -86,9 +86,6 @@ function get_blog_admin_password {
86 86
 }
87 87
 
88 88
 function install_blog {
89
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
90
-		return
91
-	fi
92 89
 	if [ ! $FULLBLOG_DOMAIN_NAME ]; then
93 90
 		echo $'The blog domain name was not specified'
94 91
 		exit 5062

+ 1
- 6
src/freedombone-app-dlna Ver arquivo

@@ -42,9 +42,6 @@ function configure_firewall_for_dlna {
42 42
 		# docker does its own firewalling
43 43
 		return
44 44
 	fi
45
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
46
-		return
47
-	fi
48 45
 	iptables -A INPUT -p udp --dport 1900 -j ACCEPT
49 46
 	iptables -A INPUT -p tcp --dport 8200 -j ACCEPT
50 47
 	function_check save_firewall_settings
@@ -83,9 +80,7 @@ function install_dlna_main {
83 80
 	if grep -Fxq "install_dlna_main" $COMPLETION_FILE; then
84 81
 		return
85 82
 	fi
86
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
87
-		return
88
-	fi
83
+
89 84
 	apt-get -y install minidlna
90 85
 
91 86
 	if [ ! -f /etc/minidlna.conf ]; then

+ 0
- 22
src/freedombone-app-gnusocial Ver arquivo

@@ -110,9 +110,6 @@ function remove_gnusocial {
110 110
 }
111 111
 
112 112
 function install_gnusocial_main {
113
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
114
-		return
115
-	fi
116 113
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
117 114
 		echo $'No domain name was given for the microblog'
118 115
 		exit 7359
@@ -389,10 +386,6 @@ function install_gnusocial_main {
389 386
 }
390 387
 
391 388
 function install_gnusocial_plugin_sharings {
392
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
393
-		return
394
-	fi
395
-
396 389
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
397 390
 		echo $'No local/plugins directory found for the microblog'
398 391
 		exit 72945
@@ -451,10 +444,6 @@ function install_gnusocial_plugin_sharings {
451 444
 }
452 445
 
453 446
 function install_gnusocial_plugin_sharings_theme {
454
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
455
-		return
456
-	fi
457
-
458 447
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
459 448
 		echo $'No local/plugins directory found for the microblog'
460 449
 		exit 74458
@@ -503,9 +492,6 @@ function install_gnusocial_plugin_sharings_theme {
503 492
 function expire_gnusocial_posts {
504 493
 	# To prevent the database size from growing endlessly this script expires posts
505 494
 	# after a number of months
506
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
507
-		return
508
-	fi
509 495
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
510 496
 		return
511 497
 	fi
@@ -559,10 +545,6 @@ function expire_gnusocial_posts {
559 545
 }
560 546
 
561 547
 function install_gnusocial_theme {
562
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
563
-		return
564
-	fi
565
-
566 548
 	# update to the next commit
567 549
 	function_check set_repo_commit
568 550
 	set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins/Qvitter "GNU Social theme commit" "$MICROBLOG_THEME_COMMIT" $MICROBLOG_THEME_REPO
@@ -662,10 +644,6 @@ function install_gnusocial_theme {
662 644
 }
663 645
 
664 646
 function install_gnusocial_markdown {
665
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
666
-		return
667
-	fi
668
-
669 647
 	MICROBLOG_PATH=/var/www/$MICROBLOG_DOMAIN_NAME/htdocs
670 648
 
671 649
 	# update to the next commit

+ 0
- 3
src/freedombone-app-gogs Ver arquivo

@@ -83,9 +83,6 @@ function remove_gogs {
83 83
 }
84 84
 
85 85
 function install_gogs {
86
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
87
-		return
88
-	fi
89 86
 	if [ ! $GIT_DOMAIN_NAME ]; then
90 87
 		return
91 88
 	fi

+ 0
- 3
src/freedombone-app-hubzilla Ver arquivo

@@ -86,9 +86,6 @@ function remove_hubzilla {
86 86
 }
87 87
 
88 88
 function install_hubzilla {
89
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
90
-		return
91
-	fi
92 89
 	if [ ! $HUBZILLA_DOMAIN_NAME ]; then
93 90
 		return
94 91
 	fi

+ 0
- 7
src/freedombone-app-ipfs Ver arquivo

@@ -74,9 +74,6 @@ function remove_ipfs {
74 74
 }
75 75
 
76 76
 function configure_firewall_for_ipfs {
77
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
78
-		return
79
-	fi
80 77
 	if grep -Fxq "configure_firewall_for_ipfs" $COMPLETION_FILE; then
81 78
 		return
82 79
 	fi
@@ -92,10 +89,6 @@ function configure_firewall_for_ipfs {
92 89
 }
93 90
 
94 91
 function install_ipfs {
95
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
96
-		return
97
-	fi
98
-
99 92
 	if grep -Fxq "install_ipfs" $COMPLETION_FILE; then
100 93
 		return
101 94
 	fi

+ 0
- 6
src/freedombone-app-irc Ver arquivo

@@ -93,9 +93,6 @@ function configure_firewall_for_irc {
93 93
 }
94 94
 
95 95
 function install_irc_server {
96
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
97
-		return
98
-	fi
99 96
 	if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
100 97
 		return
101 98
 	fi
@@ -214,9 +211,6 @@ function install_irc_server {
214 211
 }
215 212
 
216 213
 function install_irc_client {
217
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
218
-		return
219
-	fi
220 214
 	if grep -Fxq "install_irc_client" $COMPLETION_FILE; then
221 215
 		return
222 216
 	fi

+ 0
- 3
src/freedombone-app-mediagoblin Ver arquivo

@@ -54,9 +54,6 @@ function remove_mediagoblin {
54 54
 }
55 55
 
56 56
 function install_mediagoblin {
57
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
58
-		return
59
-	fi
60 57
 	if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
61 58
 		return
62 59
 	fi

+ 0
- 6
src/freedombone-app-mumble Ver arquivo

@@ -90,9 +90,6 @@ function get_voip_server_password {
90 90
 }
91 91
 
92 92
 function configure_firewall_for_voip {
93
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
94
-		return
95
-	fi
96 93
 	if grep -Fxq "configure_firewall_for_voip" $COMPLETION_FILE; then
97 94
 		return
98 95
 	fi
@@ -109,9 +106,6 @@ function configure_firewall_for_voip {
109 106
 }
110 107
 
111 108
 function install_mumble {
112
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
113
-		return
114
-	fi
115 109
 	if grep -Fxq "install_mumble" $COMPLETION_FILE; then
116 110
 		return
117 111
 	fi

+ 0
- 12
src/freedombone-app-rss Ver arquivo

@@ -120,10 +120,6 @@ function rss_modifications {
120 120
 }
121 121
 
122 122
 function install_rss_main {
123
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
124
-		return
125
-	fi
126
-
127 123
 	if grep -Fxq "install_rss_main" $COMPLETION_FILE; then
128 124
 		return
129 125
 	fi
@@ -373,10 +369,6 @@ function install_rss_main {
373 369
 }
374 370
 
375 371
 function install_rss_gnusocial {
376
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
377
-		return
378
-	fi
379
-
380 372
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
381 373
 		return
382 374
 	fi
@@ -418,10 +410,6 @@ function install_rss_gnusocial {
418 410
 }
419 411
 
420 412
 function install_rss_mobile_reader {
421
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
422
-		return
423
-	fi
424
-
425 413
 	if [ ! $RSS_READER_PATH ]; then
426 414
 		RSS_READER_PATH=/etc/share/tt-rss
427 415
 	fi

+ 0
- 12
src/freedombone-app-sip Ver arquivo

@@ -80,9 +80,6 @@ function remove_sip {
80 80
 }
81 81
 
82 82
 function configure_firewall_for_voip_turn {
83
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
84
-		return
85
-	fi
86 83
 	if grep -Fxq "configure_firewall_for_voip_turn" $COMPLETION_FILE; then
87 84
 		return
88 85
 	fi
@@ -102,9 +99,6 @@ function configure_firewall_for_voip_turn {
102 99
 
103 100
 
104 101
 function configure_firewall_for_sip4 {
105
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
106
-		return
107
-	fi
108 102
 	if grep -Fxq "configure_firewall_for_sip4" $COMPLETION_FILE; then
109 103
 		return
110 104
 	fi
@@ -170,9 +164,6 @@ function update_sipwitch_daemon {
170 164
 }
171 165
 
172 166
 function install_sip_main {
173
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
174
-		return
175
-	fi
176 167
 	if grep -Fxq "install_sip_main" $COMPLETION_FILE; then
177 168
 		return
178 169
 	fi
@@ -260,9 +251,6 @@ function install_sip_main {
260 251
 }
261 252
 
262 253
 function install_sip_turn {
263
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
264
-		return
265
-	fi
266 254
 	if grep -Fxq "install_sip_turn" $COMPLETION_FILE; then
267 255
 		return
268 256
 	fi

+ 0
- 3
src/freedombone-app-syncthing Ver arquivo

@@ -84,9 +84,6 @@ function configure_firewall_for_syncthing {
84 84
 }
85 85
 
86 86
 function install_syncthing {
87
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
88
-		return
89
-	fi
90 87
 	if grep -Fxq "install_syncthing" $COMPLETION_FILE; then
91 88
 		return
92 89
 	fi

+ 0
- 8
src/freedombone-app-tox Ver arquivo

@@ -177,10 +177,6 @@ function tox_avahi {
177 177
 }
178 178
 
179 179
 function install_tox_node {
180
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
181
-		return
182
-	fi
183
-
184 180
 	if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
185 181
 		return
186 182
 	fi
@@ -232,10 +228,6 @@ function install_tox_node {
232 228
 }
233 229
 
234 230
 function install_tox_client {
235
-	if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
236
-		return
237
-	fi
238
-
239 231
 	if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
240 232
 		return
241 233
 	fi

+ 0
- 4
src/freedombone-app-webmail Ver arquivo

@@ -74,10 +74,6 @@ function remove_webmail {
74 74
 }
75 75
 
76 76
 function install_webmail {
77
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
78
-		return
79
-	fi
80
-
81 77
 	if grep -Fxq "install_webmail" $COMPLETION_FILE; then
82 78
 		return
83 79
 	fi

+ 0
- 3
src/freedombone-app-wiki Ver arquivo

@@ -83,9 +83,6 @@ function get_wiki_admin_password {
83 83
 }
84 84
 
85 85
 function install_wiki {
86
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MASH" ]]; then
87
-		return
88
-	fi
89 86
 	if grep -Fxq "install_wiki" $COMPLETION_FILE; then
90 87
 		return
91 88
 	fi

+ 0
- 7
src/freedombone-app-xmpp Ver arquivo

@@ -172,10 +172,6 @@ function remove_xmpp {
172 172
 }
173 173
 
174 174
 function install_xmpp_main {
175
-    if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
176
-        return
177
-    fi
178
-
179 175
     update_prosody_modules
180 176
 
181 177
     if grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then
@@ -352,9 +348,6 @@ function install_xmpp_main {
352 348
 }
353 349
 
354 350
 function install_xmpp_client {
355
-    if [[ $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
356
-        return
357
-    fi
358 351
     if grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then
359 352
         return
360 353
     fi

+ 0
- 19
src/freedombone-app-zeronet Ver arquivo

@@ -123,9 +123,6 @@ function configure_firewall_for_zeronet {
123 123
 	if grep -Fxq "configure_firewall_for_zeronet" $COMPLETION_FILE; then
124 124
 		return
125 125
 	fi
126
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
127
-		return
128
-	fi
129 126
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT
130 127
 	iptables -A INPUT -i $WIFI_INTERFACE -p tcp --dport $ZERONET_PORT -j ACCEPT
131 128
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $TRACKER_PORT -j ACCEPT
@@ -140,10 +137,6 @@ function configure_firewall_for_zeronet {
140 137
 }
141 138
 
142 139
 function install_zeronet_blog {
143
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
144
-		return
145
-	fi
146
-
147 140
 	if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
148 141
 		return
149 142
 	fi
@@ -243,10 +236,6 @@ function install_zeronet_blog {
243 236
 }
244 237
 
245 238
 function install_zeronet_mail {
246
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
247
-		return
248
-	fi
249
-
250 239
 	if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
251 240
 		return
252 241
 	fi
@@ -346,10 +335,6 @@ function install_zeronet_mail {
346 335
 }
347 336
 
348 337
 function install_zeronet_forum {
349
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
350
-		return
351
-	fi
352
-
353 338
 	if grep -Fxq "install_zeronet_forum" $COMPLETION_FILE; then
354 339
 		return
355 340
 	fi
@@ -443,10 +428,6 @@ function install_zeronet_forum {
443 428
 }
444 429
 
445 430
 function install_zeronet_main {
446
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
447
-		return
448
-	fi
449
-
450 431
 	if grep -Fxq "install_zeronet_main" $COMPLETION_FILE; then
451 432
 		return
452 433
 	fi