Remove some annoying variant boilerplate

src/freedombone-app-blog

 }
 
 function install_blog {
-	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
-		return
-	fi
 	if [ ! $FULLBLOG_DOMAIN_NAME ]; then
 		echo $'The blog domain name was not specified'
 		exit 5062

src/freedombone-app-dlna

 		# docker does its own firewalling
 		return
 	fi
-	if [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_WRITER" || $SYSTEM_TYPE == "$VARIANT_SOCIAL" ]]; then
-		return
-	fi
 	iptables -A INPUT -p udp --dport 1900 -j ACCEPT
 	iptables -A INPUT -p tcp --dport 8200 -j ACCEPT
 	function_check save_firewall_settings
 	if grep -Fxq "install_dlna_main" $COMPLETION_FILE; then
 		return
 	fi
-	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
-		return
-	fi
+
 	apt-get -y install minidlna
 
 	if [ ! -f /etc/minidlna.conf ]; then

src/freedombone-app-gnusocial

 }
 
 function install_gnusocial_main {
-	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
-		return
-	fi
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
 		echo $'No domain name was given for the microblog'
 		exit 7359
 }
 
 function install_gnusocial_plugin_sharings {
-	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
-		return
-	fi
-
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
 		echo $'No local/plugins directory found for the microblog'
 		exit 72945
 }
 
 function install_gnusocial_plugin_sharings_theme {
-	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
-		return
-	fi
-
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins ]; then
 		echo $'No local/plugins directory found for the microblog'
 		exit 74458
 function expire_gnusocial_posts {
 	# To prevent the database size from growing endlessly this script expires posts
 	# after a number of months
-	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
-		return
-	fi
 	if [ ! -d /var/www/$MICROBLOG_DOMAIN_NAME/htdocs ]; then
 		return
 	fi
 }
 
 function install_gnusocial_theme {
-	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
-		return
-	fi
-
 	# update to the next commit
 	function_check set_repo_commit
 	set_repo_commit /var/www/$MICROBLOG_DOMAIN_NAME/htdocs/local/plugins/Qvitter "GNU Social theme commit" "$MICROBLOG_THEME_COMMIT" $MICROBLOG_THEME_REPO
 }
 
 function install_gnusocial_markdown {
-	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
-		return
-	fi
-
 	MICROBLOG_PATH=/var/www/$MICROBLOG_DOMAIN_NAME/htdocs
 
 	# update to the next commit

src/freedombone-app-gogs

 }
 
 function install_gogs {
-	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
-		return
-	fi
 	if [ ! $GIT_DOMAIN_NAME ]; then
 		return
 	fi

src/freedombone-app-hubzilla

 }
 
 function install_hubzilla {
-	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
-		return
-	fi
 	if [ ! $HUBZILLA_DOMAIN_NAME ]; then
 		return
 	fi

src/freedombone-app-ipfs

 }
 
 function configure_firewall_for_ipfs {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" ]]; then
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_ipfs" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_ipfs {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MAILBOX" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_ipfs" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-irc

 }
 
 function install_irc_server {
-	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
-		return
-	fi
 	if grep -Fxq "install_irc_server" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_irc_client {
-	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
-		return
-	fi
 	if grep -Fxq "install_irc_client" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-mediagoblin

 }
 
 function install_mediagoblin {
-	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
-		return
-	fi
 	if [ ! $MEDIAGOBLIN_DOMAIN_NAME ]; then
 		return
 	fi

src/freedombone-app-mumble

 }
 
 function configure_firewall_for_voip {
-	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
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_voip" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_mumble {
-	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
-		return
-	fi
 	if grep -Fxq "install_mumble" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-rss

 }
 
 function install_rss_main {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_rss_main" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_rss_gnusocial {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! $MICROBLOG_DOMAIN_NAME ]; then
 		return
 	fi
 }
 
 function install_rss_mobile_reader {
-	if [[ $SYSTEM_TYPE == "$VARIANT_MAILBOX" || $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_DEVELOPER" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if [ ! $RSS_READER_PATH ]; then
 		RSS_READER_PATH=/etc/share/tt-rss
 	fi

src/freedombone-app-sip

 }
 
 function configure_firewall_for_voip_turn {
-	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
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_voip_turn" $COMPLETION_FILE; then
 		return
 	fi
 
 
 function configure_firewall_for_sip4 {
-	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
-		return
-	fi
 	if grep -Fxq "configure_firewall_for_sip4" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_sip_main {
-	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
-		return
-	fi
 	if grep -Fxq "install_sip_main" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_sip_turn {
-	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
-		return
-	fi
 	if grep -Fxq "install_sip_turn" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-syncthing

 }
 
 function install_syncthing {
-	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
-		return
-	fi
 	if grep -Fxq "install_syncthing" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-tox

 }
 
 function install_tox_node {
-	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
-		return
-	fi
-
 	if grep -Fxq "install_tox_node" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_tox_client {
-	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
-		return
-	fi
-
 	if grep -Fxq "install_tox_client" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-webmail

 }
 
 function install_webmail {
-	if [[ $SYSTEM_TYPE == "$VARIANT_CHAT" || $SYSTEM_TYPE == "$VARIANT_MEDIA" || $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_webmail" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-wiki

 }
 
 function install_wiki {
-	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
-		return
-	fi
 	if grep -Fxq "install_wiki" $COMPLETION_FILE; then
 		return
 	fi

src/freedombone-app-xmpp

 }
 
 function install_xmpp_main {
-    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
-        return
-    fi
-
     update_prosody_modules
 
     if grep -Fxq "install_xmpp_main" $COMPLETION_FILE; then
 }
 
 function install_xmpp_client {
-    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
-        return
-    fi
     if grep -Fxq "install_xmpp_client" $COMPLETION_FILE; then
         return
     fi

src/freedombone-app-zeronet

 	if grep -Fxq "configure_firewall_for_zeronet" $COMPLETION_FILE; then
 		return
 	fi
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $ZERONET_PORT -j ACCEPT
 	iptables -A INPUT -i $WIFI_INTERFACE -p tcp --dport $ZERONET_PORT -j ACCEPT
 	iptables -A INPUT -i $WIFI_INTERFACE -p udp --dport $TRACKER_PORT -j ACCEPT
 }
 
 function install_zeronet_blog {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_blog" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_zeronet_mail {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_mail" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_zeronet_forum {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_forum" $COMPLETION_FILE; then
 		return
 	fi
 }
 
 function install_zeronet_main {
-	if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
-		return
-	fi
-
 	if grep -Fxq "install_zeronet_main" $COMPLETION_FILE; then
 		return
 	fi