installer updates

none
This commit is contained in:
Jerry.Benton 2016-05-23 02:58:07 -04:00
parent 3566da77d0
commit 8718988015
6 changed files with 3 additions and 23 deletions

View file

@ -152,6 +152,7 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.original /etc/MailScanner/MailScanner.conf.dist > /etc/MailScanner/MailScanner.conf
mkdir -p ${SAVEDIR}/etc/MailScanner
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link

View file

@ -89,7 +89,6 @@ if [ -L '/etc/MailScanner/custom' ]; then
fi
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner
cp -f /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.original
fi
exit 0

16
debian/install.sh vendored
View file

@ -393,22 +393,6 @@ done
# will pause if a perl module was missing
timewait $PMODWAIT
# save the old MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.save.$$
fi
# remove old versions
if [ -d /etc/MailScanner ]; then
dpkg-query -l mailscanner > /dev/null 2>&1
RETVAL="$?"
if [ $RETVAL -eq 0 ]; then
apt-get -y remove mailscanner
fi
fi
clear
echo;
echo "Installing the MailScanner .deb package ... ";

View file

@ -394,6 +394,7 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.original /etc/MailScanner/MailScanner.conf.dist > /etc/MailScanner/MailScanner.conf
mkdir -p ${SAVEDIR}/etc/MailScanner
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link

View file

@ -446,11 +446,6 @@ if [ -f '/etc/freshclam.conf' ]; then
fi
fi
# save the old MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
mv /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.save.$$
fi
clear
echo;
echo "Installing the MailScanner RPM ... ";

View file

@ -306,7 +306,6 @@ if [ -d '/usr/share/MailScanner/MailScanner' ]; then
fi
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner
cp -f /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.original
fi
@ -412,6 +411,7 @@ if [ -f /etc/MailScanner/MailScanner.conf.original -a -f /etc/MailScanner/MailSc
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.original /etc/MailScanner/MailScanner.conf.dist > /etc/MailScanner/MailScanner.conf
mkdir -p ${SAVEDIR}/etc/MailScanner
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
cp -f /etc/MailScanner/MailScanner.conf ${SAVEDIR}/etc/MailScanner/MailScanner.new > /dev/null 2>&1
fi
# update web bug link