installer updates

none
This commit is contained in:
Jerry.Benton 2016-05-10 21:56:56 -04:00
parent 88ea2801ee
commit 53666ec309
7 changed files with 195 additions and 244 deletions

View file

@ -134,6 +134,9 @@ if [ ! -L '/etc/init.d/mailscanner' ]; then
ln -s /usr/lib/MailScanner/init/ms-init /etc/init.d/mailscanner
fi
# create if missing
[ -d "/etc/MailScanner/conf.d" ] || mkdir -p /etc/MailScanner/conf.d
# fix the clamav wrapper if the user does not exist
if [ -d '/etc/clamav' ]; then

136
debian/DEBIAN/preinst vendored
View file

@ -16,72 +16,8 @@ set -e
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
# handle old files and updates
if [ -f "/etc/MailScanner/MailScanner.conf" ]; then
# create if missing
[ -d "/etc/MailScanner/conf.d" ] || mkdir -p /etc/MailScanner/conf.d
# /usr/lib/MailScanner
if [ -d "/var/lib/MailScanner" ]; then
rm -rf /var/lib/MailScanner
fi
# /etc/MailScanner/CustomFunctions
if [ -d "/etc/MailScanner/CustomFunctions" -a ! -L "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p /usr/share/MailScanner/perl/custom/
cp -rf /etc/MailScanner/CustomFunctions/* /usr/share/MailScanner/perl/custom/
rm -rf /etc/MailScanner/CustomFunctions
fi
# /etc/MailScanner/custom
if [ -d "/etc/MailScanner/custom" -a ! -L "/etc/MailScanner/custom" ]; then
mkdir -p /usr/share/MailScanner/perl/custom/
cp -rf /etc/MailScanner/custom/* /usr/share/MailScanner/perl/custom/
rm -rf /etc/MailScanner/custom
fi
# /etc/MailScanner/custom symlink
if [ -L "/etc/MailScanner/custom" ]; then
rm -f /etc/MailScanner/custom
fi
# /etc/MailScanner/Custom
if [ -d "/etc/MailScanner/Custom" -a ! -L "/etc/MailScanner/Custom" ]; then
mkdir -p /usr/share/MailScanner/perl/custom/
cp -rf /etc/MailScanner/Custom/* /usr/share/MailScanner/perl/custom/
rm -rf /etc/MailScanner/Custom
fi
# /usr/share/MailScanner/MailScanner
if [ -d "/usr/share/MailScanner/MailScanner" ]; then
rm -rf /usr/share/MailScanner/MailScanner
fi
# /etc/MailScanner/autoupdate
if [ -d "/etc/MailScanner/autoupdate" ]; then
rm -rf /etc/MailScanner/autoupdate
fi
# /etc/MailScanner/wrapper
if [ -d "/etc/MailScanner/wrapper" ]; then
rm -rf /etc/MailScanner/wrapper
fi
# /usr/share/MailScanner/reports
if [ -d "/etc/MailScanner/reports" -a ! -L "/etc/MailScanner/reports" ]; then
mkdir -p /usr/share/MailScanner/reports/
cp -rf /etc/MailScanner/reports/* /usr/share/MailScanner/reports/
rm -rf /etc/MailScanner/reports/
fi
# /etc/MailScanner/CustomConfig.pm
if [ -f "/etc/MailScanner/CustomConfig.pm" -a ! -L "/etc/MailScanner/CustomConfig.pm" ]; then
cp -uf /etc/MailScanner/CustomConfig.pm /usr/share/MailScanner/perl/MailScanner/CustomConfig.pm
rm -f /etc/MailScanner/CustomConfig.pm
fi
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
# remove old symlink if present
if [ -L '/etc/init.d/mailscanner' ]; then
@ -107,4 +43,72 @@ if [ -f '/etc/init.d/MailScanner' ]; then
rm -f /etc/init.d/MailScanner
fi
if [ -f "/etc/default/mailscanner" ]; then
mkdir -p ${SAVEDIR}/etc/default
cp -f /etc/default/mailscanner ${SAVEDIR}/etc/default/mailscanner
rm -f /etc/default/mailscanner
fi
if [ -f "/etc/default/MailScanner" ]; then
mkdir -p ${SAVEDIR}/etc/default
cp -f /etc/default/MailScanner ${SAVEDIR}/etc/default/MailScanner
rm -f /etc/default/MailScanner
fi
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
rm -rf /usr/lib/MailScanner
fi
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions/* $SAVEDIR/etc/MailScanner/CustomFunctions
rm -rf /etc/MailScanner/CustomFunctions
fi
if [ -d "/etc/MailScanner/Custom" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner/Custom
cp -f /etc/MailScanner/Custom/* $SAVEDIR/etc/MailScanner/Custom
rm -rf /etc/MailScanner/Custom
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
rm -f /etc/MailScanner/CustomConfig.pm
fi
if [ -d "/etc/MailScanner/reports" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner/reports
cp -pr /etc/MailScanner/reports $SAVEDIR/etc/MailScanner/reports
rm -rf /etc/MailScanner/reports
fi
if [ -d "/etc/MailScanner/custom" ]; then
rm -rf /etc/MailScanner/custom
fi
if [ -d "/etc/MailScanner/wrapper" ]; then
rm -rf /etc/MailScanner/wrapper
fi
if [ -d "/etc/MailScanner/autoupdate" ]; then
rm -rf /etc/MailScanner/autoupdate
fi
# /usr/share/MailScanner/MailScanner
if [ -d "/usr/share/MailScanner/MailScanner" ]; then
rm -rf /usr/share/MailScanner/MailScanner
fi
# /usr/lib/MailScanner
if [ -d "/var/lib/MailScanner" ]; then
rm -rf /var/lib/MailScanner
fi
# /etc/MailScanner/custom symlink
if [ -L "/etc/MailScanner/custom" ]; then
rm -f /etc/MailScanner/custom
fi
exit 0

89
debian/install.sh vendored
View file

@ -237,95 +237,6 @@ else
RAMDISK=0
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
if [ -f "/etc/default/mailscanner" ]; then
mkdir -p ${SAVEDIR}/etc/default
cp -f /etc/default/mailscanner ${SAVEDIR}/etc/default/mailscanner
rm -f /etc/default/mailscanner
clear
echo;
echo "I have copied /etc/default/mailscanner to";
echo "${SAVEDIR}/etc/default/mailscanner";
echo;
timewait 3;
fi
if [ -f "/etc/default/MailScanner" ]; then
mkdir -p ${SAVEDIR}/etc/default
cp -f /etc/default/MailScanner ${SAVEDIR}/etc/default/MailScanner
rm -f /etc/default/MailScanner
clear
echo;
echo "I have copied /etc/default/MailScanner to";
echo "${SAVEDIR}/etc/default/MailScanner";
echo;
timewait 3;
fi
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
rm -rf /usr/lib/MailScanner
clear
echo;
echo "I have copied /usr/lib/MailScanner/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions";
echo "Copy your required custom functions to: /usr/share/MailScanner/custom";
echo;
timewait 3;
fi
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions/* $SAVEDIR/etc/MailScanner/CustomFunctions
rm -rf /etc/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo "Copy your required custom functions to: /usr/share/MailScanner/custom";
echo;
timewait 3;
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
rm -f /etc/MailScanner/CustomConfig.pm
clear
echo;
echo "I have copied /etc/MailScanner/CustomConfig.pm to";
echo "$SAVEDIR/etc/MailScanner/CustomConfig.pm";
echo;
timewait 3;
fi
if [ -d "/etc/MailScanner/reports" ]; then
mkdir -p ${SAVEDIR}/etc/MailScanner/reports
cp -pr /etc/MailScanner/reports $SAVEDIR/etc/MailScanner/reports
rm -rf /etc/MailScanner/reports
clear
echo;
echo "I have copied /etc/MailScanner/reports to";
echo "$SAVEDIR/etc/MailScanner/reports";
echo;
timewait 3;
fi
if [ -d "/etc/MailScanner/custom" ]; then
rm -rf /etc/MailScanner/custom
fi
if [ -d "/etc/MailScanner/wrapper" ]; then
rm -rf /etc/MailScanner/wrapper
fi
if [ -d "/etc/MailScanner/autoupdate" ]; then
rm -rf /etc/MailScanner/autoupdate
fi
# base system packages
BASEPACKAGES=();
BASEPACKAGES+=('perl-doc'); BASEPACKAGES+=('libmailtools-perl'); BASEPACKAGES+=('re2c');

View file

@ -358,51 +358,6 @@ else
SELMODE=0
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
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
echo;
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
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions* $SAVEDIR/etc/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo;
rm -rf /etc/MailScanner/CustomFunctions
timewait 3;
fi
if [ -L "/etc/MailScanner/CustomFunctions" ]; then
rm -f /etc/MailScanner/CustomFunctions
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p $SAVEDIR/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
clear
echo;
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
# base system packages
BASEPACKAGES="binutils gcc glibc-devel libaio make man-pages man-pages-overrides patch rpm tar time unzip which zip libtool-ltdl perl curl wget openssl openssl-devel bzip2-devel";

View file

@ -246,28 +246,85 @@ rm -rf ${RPM_BUILD_ROOT}
# remove old symlink if present
if [ -L '/etc/init.d/mailscanner' ]; then
chkconfig --del mailscanner
chkconfig --del mailscanner >/dev/null 2>&1
rm -f /etc/init.d/mailscanner
fi
# remove old file if present
if [ -f '/etc/init.d/mailscanner' ]; then
chkconfig --del mailscanner
chkconfig --del mailscanner >/dev/null 2>&1
rm -f /etc/init.d/mailscanner
fi
# remove old symlink if present
if [ -L '/etc/init.d/MailScanner' ]; then
chkconfig --del MailScanner
chkconfig --del MailScanner >/dev/null 2>&1
rm -f /etc/init.d/MailScanner
fi
# remove old file if present
if [ -f '/etc/init.d/MailScanner' ]; then
chkconfig --del MailScanner
chkconfig --del MailScanner >/dev/null 2>&1
rm -f /etc/init.d/MailScanner
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
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
echo;
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
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions/* $SAVEDIR/etc/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo;
rm -rf /etc/MailScanner/CustomFunctions
timewait 3;
fi
if [ -L "/etc/MailScanner/CustomFunctions" ]; then
rm -f /etc/MailScanner/CustomFunctions
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p $SAVEDIR/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
clear
echo;
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
if [ -d "/etc/MailScanner/reports" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/reports
cp -f /etc/MailScanner/reports/* $SAVEDIR/etc/MailScanner/reports
clear
echo;
echo "I have copied /etc/MailScanner/reports/* to";
echo "$SAVEDIR/etc/MailScanner/reports";
echo;
rm -rf /etc/MailScanner/reports
timewait 3;
fi
exit 0
%post

View file

@ -223,42 +223,6 @@ if [ $CPANOPTION != 1 ]; then
fi
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
if [ -d "/usr/lib/MailScanner" ]; then
mkdir -p $SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions
cp -f /usr/lib/MailScanner/MailScanner/CustomFunctions/* $SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /usr/lib/MailScanner/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/usr/lib/MailScanner/MailScanner/CustomFunctions";
echo;
timewait 3;
fi
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions* $SAVEDIR/etc/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo;
timewait 3;
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p $SAVEDIR/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
clear
echo;
echo "I have copied /etc/MailScanner/CustomConfig.pm to";
echo "$SAVEDIR/etc/MailScanner/CustomConfig.pm";
echo;
timewait 3;
fi
# base system packages
BASEPACKAGES="binutils gcc glibc-devel libaio1 patch make man-pages patch rpm tar time unzip which zip libtool perl curl wget openssl libopenssl-devel bzip2 tnef unrar razor-agents";

View file

@ -246,28 +246,85 @@ rm -rf ${RPM_BUILD_ROOT}
# remove old symlink if present
if [ -L '/etc/init.d/mailscanner' ]; then
chkconfig --del mailscanner
chkconfig --del mailscanner >/dev/null 2>&1
rm -f /etc/init.d/mailscanner
fi
# remove old file if present
if [ -f '/etc/init.d/mailscanner' ]; then
chkconfig --del mailscanner
chkconfig --del mailscanner >/dev/null 2>&1
rm -f /etc/init.d/mailscanner
fi
# remove old symlink if present
if [ -L '/etc/init.d/MailScanner' ]; then
chkconfig --del MailScanner
chkconfig --del MailScanner >/dev/null 2>&1
rm -f /etc/init.d/MailScanner
fi
# remove old file if present
if [ -f '/etc/init.d/MailScanner' ]; then
chkconfig --del MailScanner
chkconfig --del MailScanner >/dev/null 2>&1
rm -f /etc/init.d/MailScanner
fi
# back up their stuff
SAVEDIR="$HOME/ms_upgrade/saved.$$";
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
echo;
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
if [ -d "/etc/MailScanner/CustomFunctions" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/CustomFunctions
cp -f /etc/MailScanner/CustomFunctions/* $SAVEDIR/etc/MailScanner/CustomFunctions
clear
echo;
echo "I have copied /etc/MailScanner/CustomFunctions/* to";
echo "$SAVEDIR/etc/MailScanner/CustomFunctions";
echo;
rm -rf /etc/MailScanner/CustomFunctions
timewait 3;
fi
if [ -L "/etc/MailScanner/CustomFunctions" ]; then
rm -f /etc/MailScanner/CustomFunctions
fi
if [ -f "/etc/MailScanner/CustomConfig.pm" ]; then
mkdir -p $SAVEDIR/etc/MailScanner
cp -f /etc/MailScanner/CustomConfig.pm $SAVEDIR/etc/MailScanner/
clear
echo;
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
if [ -d "/etc/MailScanner/reports" ]; then
mkdir -p $SAVEDIR/etc/MailScanner/reports
cp -f /etc/MailScanner/reports/* $SAVEDIR/etc/MailScanner/reports
clear
echo;
echo "I have copied /etc/MailScanner/reports/* to";
echo "$SAVEDIR/etc/MailScanner/reports";
echo;
rm -rf /etc/MailScanner/reports
timewait 3;
fi
exit 0
%post