From be4b3aba255d42ab4e105894c10d370839c3d6ca Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Thu, 25 Feb 2016 11:54:26 +0000 Subject: [PATCH] Also install irc client --- src/freedombone | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/src/freedombone b/src/freedombone index e3b376b4..e3b9db01 100755 --- a/src/freedombone +++ b/src/freedombone @@ -7437,6 +7437,17 @@ function install_watchdog_script { echo 'install_watchdog_script' >> $COMPLETION_FILE } +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 + apt-get -y install irssi + echo 'install_irc_client' >> $COMPLETION_FILE +} + 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 @@ -7446,11 +7457,6 @@ function install_irc_server { fi apt-get -y install ngircd - # for mesh peers also install an irc client - if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then - apt-get -y install irssi - fi - if [ ! -d /etc/ngircd ]; then echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE" exit 53 @@ -9058,11 +9064,11 @@ function install_hubzilla { echo '' >> /home/$MY_USERNAME/README echo 'Hubzilla' >> /home/$MY_USERNAME/README echo '========' >> /home/$MY_USERNAME/README - if [[ $ONION_ONLY == 'no' ]]; then - echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README - else - echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README - fi + if [[ $ONION_ONLY == 'no' ]]; then + echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README + else + echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README + fi echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README chmod 600 /home/$MY_USERNAME/README @@ -10317,6 +10323,7 @@ install_tox_node install_tox_client tox_avahi configure_firewall_for_xmpp +install_irc_client install_irc_server configure_firewall_for_irc install_voip