MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2024-11-10 17:35:06 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

more fixes

Browse source 
none
This commit is contained in:
Jerry.Benton 2016-05-10 21:36:46 -04:00
parent 2921a3a9c9
commit 88ea2801ee
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/usr/sbin/ms-upgrade-conf
View file

@ -74,7 +74,7 @@ EOU
Usage:
cd /usr/share/MailScanner/reports/en
upgrade_languages_conf languages.conf languages.conf.rpmnew > languages.new
ms-upgrade-conf languages.conf languages.conf.rpmnew > languages.new
mv -f languages.conf languages.old
mv -f languages.new languages.conf
@ -331,11 +331,10 @@ Notes
I would advise you to check on any parameters which are different between
the default new conf file and the conf file you just created, so that you
find any parameters whose default values have changed.
If you ran this with a command like this
upgrade_$filescore $filedot $filedot.rpmnew > $filenew
then you should do
diff -w $filedot.rpmnew $filenew
and check for any differences in values you have not changed yourself.
to check for any differences in values you have not changed yourself.
EOL
sleep(5);

9
rhel/install.sh
View file

@ -361,7 +361,7 @@ fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
if [ -d "/usr/lib/MailScanner" ]; then
if [ -d "/usr/lib/MailScanner/MailScanner/CustomFunctions" ]; then
mkdir -p $SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions
cp -f /usr/lib/MailScanner/MailScanner/CustomFunctions/* $SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions
clear
@ -369,6 +369,9 @@ if [ -d "/usr/lib/MailScanner" ]; then
echo "I have copied /usr/lib/MailScanner/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions";
echo;
if [ -d "/usr/lib/MailScanner/MailScanner" ]; then
rm -rf /usr/lib/MailScanner/MailScanner
fi
timewait 3;
fi
@ -380,10 +383,11 @@ if [ -d "/etc/MailScanner/CustomFunctions" ]; then
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo;
rm -rf /etc/MailScanner/CustomFunctions
timewait 3;
fi
if [ -f "/etc/MailScanner/CustomFunctions" ]; then
if [ -L "/etc/MailScanner/CustomFunctions" ]; then
rm -f /etc/MailScanner/CustomFunctions
fi
@ -395,6 +399,7 @@ if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
echo "I have copied /etc/MailScanner/CustomConfig.pm to";
echo "$SAVEDIR/etc/MailScanner/CustomConfig.pm";
echo;
rm -f /etc/MailScanner/CustomConfig.pm
timewait 3;
fi