From 88ea2801ee97b83a84a5df1d06fbe9f641535296 Mon Sep 17 00:00:00 2001
From: "Jerry.Benton" <jerry.benton@mailborder.com>
Date: Tue, 10 May 2016 21:36:46 -0400
Subject: [PATCH] more fixes

none
---
 common/usr/sbin/ms-upgrade-conf | 9 ++++-----
 rhel/install.sh                 | 9 +++++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/common/usr/sbin/ms-upgrade-conf b/common/usr/sbin/ms-upgrade-conf
index b8b6629..d579c62 100644
--- a/common/usr/sbin/ms-upgrade-conf
+++ b/common/usr/sbin/ms-upgrade-conf
@@ -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);
diff --git a/rhel/install.sh b/rhel/install.sh
index d791717..3ac534c 100644
--- a/rhel/install.sh
+++ b/rhel/install.sh
@@ -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