Merge pull request #105 from shawniverson/092917mtatest

Return result of mta install
This commit is contained in:
Shawn Iverson 2017-09-29 22:02:39 -04:00 committed by GitHub
commit 4bd3f1a730
3 changed files with 12 additions and 0 deletions

4
debian/install.sh vendored
View file

@ -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

View file

@ -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

View file

@ -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