mirror of
https://github.com/MailScanner/v5.git
synced 2025-02-26 00:16:17 +08:00
Merge pull request #105 from shawniverson/092917mtatest
Return result of mta install
This commit is contained in:
commit
4bd3f1a730
3 changed files with 12 additions and 0 deletions
4
debian/install.sh
vendored
4
debian/install.sh
vendored
|
@ -449,6 +449,10 @@ done
|
||||||
# install this separate in case it conflicts
|
# install this separate in case it conflicts
|
||||||
if [ "x$MTAOPTION" != "x" ]; then
|
if [ "x$MTAOPTION" != "x" ]; then
|
||||||
$APTGET -yf install $MTAOPTION
|
$APTGET -yf install $MTAOPTION
|
||||||
|
if [ $? != 0 ]; then
|
||||||
|
echo "Error installing $MTAOPTION MTA"
|
||||||
|
echo "This usually means an MTA is already installed."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# fix the stupid line in /etc/freshclam.conf that disables freshclam
|
# fix the stupid line in /etc/freshclam.conf that disables freshclam
|
||||||
|
|
|
@ -696,6 +696,10 @@ $YUM -y --skip-broken install $BASEPACKAGES $EPELOPTION
|
||||||
# install this separate in case it conflicts
|
# install this separate in case it conflicts
|
||||||
if [ "x$MTAOPTION" != "x" ]; then
|
if [ "x$MTAOPTION" != "x" ]; then
|
||||||
$YUM -y install $MTAOPTION
|
$YUM -y install $MTAOPTION
|
||||||
|
if [ $? != 0 ]; then
|
||||||
|
echo "Error installing $MTAOPTION MTA"
|
||||||
|
echo "This usually means an MTA is already installed."
|
||||||
|
fi
|
||||||
if [ $MTAOPTION = "sendmail" ]; then
|
if [ $MTAOPTION = "sendmail" ]; then
|
||||||
mkdir -p /var/spool/mqueue.in
|
mkdir -p /var/spool/mqueue.in
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -449,6 +449,10 @@ $ZYPPER --non-interactive --ignore-unknown install $BASEPACKAGES
|
||||||
# install this separate in case it conflicts
|
# install this separate in case it conflicts
|
||||||
if [ "x$MTAOPTION" != "x" ]; then
|
if [ "x$MTAOPTION" != "x" ]; then
|
||||||
$ZYPPER --non-interactive --ignore-unknown install $MTAOPTION
|
$ZYPPER --non-interactive --ignore-unknown install $MTAOPTION
|
||||||
|
if [ $? != 0 ]; then
|
||||||
|
echo "Error installing $MTAOPTION MTA"
|
||||||
|
echo "This usually means an MTA is already installed."
|
||||||
|
fi
|
||||||
if [ $MTAOPTION = "sendmail" ]; then
|
if [ $MTAOPTION = "sendmail" ]; then
|
||||||
mkdir -p /var/spool/mqueue
|
mkdir -p /var/spool/mqueue
|
||||||
mkdir -p /var/spool/mqueue.in
|
mkdir -p /var/spool/mqueue.in
|
||||||
|
|
Loading…
Reference in a new issue