install.sh fix

none
This commit is contained in:
Jerry.Benton 2016-05-23 01:34:00 -04:00
parent cf6f7800bf
commit d2c5405f08
3 changed files with 14 additions and 15 deletions

9
debian/install.sh vendored
View file

@ -421,7 +421,7 @@ timewait $PMODWAIT
# save the old MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.$$
mv /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
fi
# remove old versions
@ -465,16 +465,15 @@ else
echo;
timewait 1
if [ -f '/etc/MailScanner/MailScanner.conf' -a -f '/etc/MailScanner/MailScanner.conf.dpkg-dist' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.dpkg-dist > /etc/MailScanner/MailScanner.new
if [ -f /etc/MailScanner/MailScanner.conf.old.$$ -a -f '/etc/MailScanner/MailScanner.conf' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.$$ /etc/MailScanner/MailScanner.conf > /etc/MailScanner/MailScanner.new
mv -f /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
mv -f /etc/MailScanner/MailScanner.new /etc/MailScanner/MailScanner.conf
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
fi
fi
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
# create ramdisk
if [ $RAMDISK == 1 ]; then
if [ -d '/var/spool/MailScanner/incoming' ]; then

View file

@ -745,7 +745,7 @@ cd $THISCURRPMDIR
# save the old MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.$$
mv /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
fi
# remove old versions
@ -797,15 +797,14 @@ else
CAVNEW='Monitors for ClamAV Updates = /usr/local/share/clamav/*.cld /usr/local/share/clamav/*.cvd /var/lib/clamav/*.inc/* /var/lib/clamav/*.?db /var/lib/clamav/*.cvd';
perl -pi -e 's/'$CAVOLD'/'$CAVNEW'/;' /etc/MailScanner/MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' -a -f '/etc/MailScanner/MailScanner.conf.rpmnew' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.rpmnew > /etc/MailScanner/MailScanner.new
if [ -f /etc/MailScanner/MailScanner.conf.old.$$ -a -f '/etc/MailScanner/MailScanner.conf' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.$$ /etc/MailScanner/MailScanner.conf > /etc/MailScanner/MailScanner.new
mv -f /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
mv -f /etc/MailScanner/MailScanner.new /etc/MailScanner/MailScanner.conf
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
fi
fi
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
# create ramdisk
if [ $RAMDISK == 1 ]; then
if [ -d '/var/spool/MailScanner/incoming' ]; then

View file

@ -473,7 +473,7 @@ fi
# save the old MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' ]; then
cp /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.$$
mv /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
fi
# remove old versions
@ -525,14 +525,15 @@ else
CAVNEW='Monitors for ClamAV Updates = /usr/local/share/clamav/*.cld /usr/local/share/clamav/*.cvd /var/lib/clamav/*.inc/* /var/lib/clamav/*.?db /var/lib/clamav/*.cvd';
perl -pi -e 's/'$CAVOLD'/'$CAVNEW'/;' /etc/MailScanner/MailScanner.conf
if [ -f '/etc/MailScanner/MailScanner.conf' -a -f '/etc/MailScanner/MailScanner.conf.rpmnew' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.rpmnew > /etc/MailScanner/MailScanner.new
if [ -f /etc/MailScanner/MailScanner.conf.old.$$ -a -f '/etc/MailScanner/MailScanner.conf' ]; then
ms-upgrade-conf /etc/MailScanner/MailScanner.conf.$$ /etc/MailScanner/MailScanner.conf > /etc/MailScanner/MailScanner.new
mv -f /etc/MailScanner/MailScanner.conf /etc/MailScanner/MailScanner.conf.old.$$
mv -f /etc/MailScanner/MailScanner.new /etc/MailScanner/MailScanner.conf
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
fi
fi
mv -f /etc/MailScanner/MailScanner.conf.* ${SAVEDIR}/etc/MailScanner > /dev/null 2>&1
# create ramdisk
if [ $RAMDISK == 1 ]; then