From d2c5405f085bd2f6ea4e218204272242eca675f7 Mon Sep 17 00:00:00 2001 From: "Jerry.Benton" Date: Mon, 23 May 2016 01:34:00 -0400 Subject: [PATCH] install.sh fix none --- debian/install.sh | 11 +++++------ rhel/install.sh | 9 ++++----- suse/install.sh | 9 +++++---- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/debian/install.sh b/debian/install.sh index 5459ca1..ee88062 100644 --- a/debian/install.sh +++ b/debian/install.sh @@ -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 - fi + 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 diff --git a/rhel/install.sh b/rhel/install.sh index e98793e..0c6bfcd 100644 --- a/rhel/install.sh +++ b/rhel/install.sh @@ -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 diff --git a/suse/install.sh b/suse/install.sh index 5e262e7..f474aaa 100644 --- a/suse/install.sh +++ b/suse/install.sh @@ -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