Преглед на файлове

Also install irc client

Bob Mottram преди 9 години
родител
ревизия
be4b3aba25
променени са 1 файла, в които са добавени 17 реда и са изтрити 10 реда
  1. 17
    10
      src/freedombone

+ 17
- 10
src/freedombone Целия файл

7437
     echo 'install_watchdog_script' >> $COMPLETION_FILE
7437
     echo 'install_watchdog_script' >> $COMPLETION_FILE
7438
 }
7438
 }
7439
 
7439
 
7440
+function install_irc_client {
7441
+    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
7442
+        return
7443
+    fi
7444
+    if grep -Fxq "install_irc_client" $COMPLETION_FILE; then
7445
+        return
7446
+    fi
7447
+    apt-get -y install irssi
7448
+    echo 'install_irc_client' >> $COMPLETION_FILE
7449
+}
7450
+
7440
 function install_irc_server {
7451
 function install_irc_server {
7441
     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
7452
     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
7442
         return
7453
         return
7446
     fi
7457
     fi
7447
     apt-get -y install ngircd
7458
     apt-get -y install ngircd
7448
 
7459
 
7449
-    # for mesh peers also install an irc client
7450
-    if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
7451
-        apt-get -y install irssi
7452
-    fi
7453
-
7454
     if [ ! -d /etc/ngircd ]; then
7460
     if [ ! -d /etc/ngircd ]; then
7455
         echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
7461
         echo $"ERROR: ngircd does not appear to have installed. $CHECK_MESSAGE"
7456
         exit 53
7462
         exit 53
9058
         echo '' >> /home/$MY_USERNAME/README
9064
         echo '' >> /home/$MY_USERNAME/README
9059
         echo 'Hubzilla' >> /home/$MY_USERNAME/README
9065
         echo 'Hubzilla' >> /home/$MY_USERNAME/README
9060
         echo '========' >> /home/$MY_USERNAME/README
9066
         echo '========' >> /home/$MY_USERNAME/README
9061
-		if [[ $ONION_ONLY == 'no' ]]; then
9062
-			echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README
9063
-		else
9064
-			echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README
9065
-		fi
9067
+        if [[ $ONION_ONLY == 'no' ]]; then
9068
+            echo $"Open https://$HUBZILLA_DOMAIN_NAME and register a new user" >> /home/$MY_USERNAME/README
9069
+        else
9070
+            echo $"Open http://$HUBZILLA_ONION_HOSTNAME and register a new user" >> /home/$MY_USERNAME/README
9071
+        fi
9066
         echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
9072
         echo $"Your MariaDB Hubzilla admin password is: $HUBZILLA_ADMIN_PASSWORD" >> /home/$MY_USERNAME/README
9067
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
9073
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/README
9068
         chmod 600 /home/$MY_USERNAME/README
9074
         chmod 600 /home/$MY_USERNAME/README
10317
 install_tox_client
10323
 install_tox_client
10318
 tox_avahi
10324
 tox_avahi
10319
 configure_firewall_for_xmpp
10325
 configure_firewall_for_xmpp
10326
+install_irc_client
10320
 install_irc_server
10327
 install_irc_server
10321
 configure_firewall_for_irc
10328
 configure_firewall_for_irc
10322
 install_voip
10329
 install_voip