Skip to content

Commit 5489024

Browse files
author
Kristan Kenney
committed
Do not install Roundcube if mail is not installed
Do not install Roundcube if Exim is not installed If Exim is not installed, dovecot is excluded from the software list as well so Roundcube does not need to be installed.
1 parent 269807c commit 5489024

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

install/hst-install-debian.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -737,17 +737,22 @@ if [ "$exim" = 'no' ]; then
737737
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
738738
software=$(echo "$software" | sed -e "s/clamav-daemon//")
739739
software=$(echo "$software" | sed -e "s/spamassassin//")
740+
software=$(echo "$software" | sed -e "s/roundcube-core//")
741+
software=$(echo "$software" | sed -e "s/roundcube-mysql//")
742+
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
740743
fi
741744
if [ "$clamd" = 'no' ]; then
742745
software=$(echo "$software" | sed -e "s/clamav-daemon//")
743746
fi
744747
if [ "$spamd" = 'no' ]; then
745748
software=$(echo "$software" | sed -e "s/spamassassin//")
746-
software=$(echo "$software" | sed -e "s/libmail-dkim-perl//")
747749
fi
748750
if [ "$dovecot" = 'no' ]; then
749751
software=$(echo "$software" | sed -e "s/dovecot-imapd//")
750752
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
753+
software=$(echo "$software" | sed -e "s/roundcube-core//")
754+
software=$(echo "$software" | sed -e "s/roundcube-mysql//")
755+
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
751756
fi
752757
if [ "$mysql" = 'no' ]; then
753758
software=$(echo "$software" | sed -e 's/mariadb-server//')

install/hst-install-ubuntu.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,9 @@ if [ "$exim" = 'no' ]; then
704704
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
705705
software=$(echo "$software" | sed -e "s/clamav-daemon//")
706706
software=$(echo "$software" | sed -e "s/spamassassin//")
707+
software=$(echo "$software" | sed -e "s/roundcube-core//")
708+
software=$(echo "$software" | sed -e "s/roundcube-mysql//")
709+
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
707710
fi
708711
if [ "$clamd" = 'no' ]; then
709712
software=$(echo "$software" | sed -e "s/clamav-daemon//")
@@ -714,6 +717,9 @@ fi
714717
if [ "$dovecot" = 'no' ]; then
715718
software=$(echo "$software" | sed -e "s/dovecot-imapd//")
716719
software=$(echo "$software" | sed -e "s/dovecot-pop3d//")
720+
software=$(echo "$software" | sed -e "s/roundcube-core//")
721+
software=$(echo "$software" | sed -e "s/roundcube-mysql//")
722+
software=$(echo "$software" | sed -e "s/roundcube-plugins//")
717723
fi
718724
if [ "$mysql" = 'no' ]; then
719725
software=$(echo "$software" | sed -e 's/mariadb-server//')

0 commit comments

Comments
 (0)