Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2559 → Rev 2560

/alcasar.sh
181,7 → 181,7
done
if [ "$response" = "2" ]
then
rm -f /tmp/alcasar-conf*
rm -f /var/tmp/alcasar-conf*
else
# Retrieve former NICname
EXTIF_saved=`grep ^EXTIF= $CONF_FILE | cut -d'=' -f2-` # EXTernal InterFace
195,7 → 195,7
fi
if [[ ( $unknown_os != 3 ) || ("$DISTRIBUTION" != "Mageia" ) || ( "$CURRENT_VERSION" != "6" ) ]]
then
if [ -e /tmp/alcasar-conf.tar.gz ] # update
if [ -e /var/tmp/alcasar-conf.tar.gz ] # update
then
echo
if [ $Lang == "fr" ]
1690,6 → 1690,7
$DIR_DEST_BIN/alcasar-bl.sh --adapt
# enable the default categories
$DIR_DEST_BIN/alcasar-bl.sh --cat_choice
rm -rf /tmp/blacklists
} # End BL()
 
#######################################################
2119,7 → 2120,7
$SED "s?^INSTALL_DATE=.*?INSTALL_DATE=$DATE?g" $CONF_FILE
$SED "s?^VERSION=.*?VERSION=$VERSION?g" $CONF_FILE
fi
rm -f /tmp/alcasar-conf*
rm -f /var/tmp/alcasar-conf*
chown -R root:apache $DIR_DEST_ETC/*
chmod -R 660 $DIR_DEST_ETC/*
chmod ug+x $DIR_DEST_ETC/digest
2159,7 → 2160,7
echo " Hit 'Enter' to continue"
fi
sleep 2
if [ "$mode" != "update" ] && [ "$DEBUG_ALCASAR" != "on" ]
if [ "$mode" == "install" ] || [ "$DEBUG_ALCASAR" == "on" ]
then
read a
fi
2214,9 → 2215,9
# Uninstall or update the running version
if [ "$mode" == "update" ]
then
$DIR_SCRIPTS/alcasar-uninstall.sh -update
$DIR_DEST_BIN/alcasar-uninstall.sh -update
else
$DIR_SCRIPTS/alcasar-uninstall.sh -full
$DIR_DEST_BIN/alcasar-uninstall.sh -full
fi
fi
if [ $DEBUG_ALCASAR == "on" ]
2225,7 → 2226,7
read a
fi
# Test if manual update
if [ -e /tmp/alcasar-conf*.tar.gz ] && [ "$mode" == "install" ]
if [ -e /var/tmp/alcasar-conf*.tar.gz ] && [ "$mode" == "install" ]
then
header_install
if [ $Lang == "fr" ]
2242,24 → 2243,24
fi
read response
if [ "$response" = "n" ] || [ "$response" = "N" ]
then rm -f /tmp/alcasar-conf*
then rm -f /var/tmp/alcasar-conf*
fi
done
fi
# Test if update
if [ -e /tmp/alcasar-conf* ]
if [ -e /var/tmp/alcasar-conf* ]
then
if [ $Lang == "fr" ]
then echo "#### Installation avec mise à jour ####";
else echo "#### Installation with update ####";
fi
# Extract the central configuration file
tar -xf /tmp/alcasar-conf* conf/etc/alcasar.conf
# Extract some info from the previous configuration file
tar -xf /var/tmp/alcasar-conf* conf/etc/alcasar.conf
ORGANISME=`grep ^ORGANISM= conf/etc/alcasar.conf|cut -d"=" -f2`
PREVIOUS_VERSION=`grep ^VERSION= conf/etc/alcasar.conf|cut -d"=" -f2`
MAJ_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f1`
MIN_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f2|cut -c1`
UPD_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f3`
MIN_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f2`
UPD_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f3|cut -c1`
mode="update"
fi
for func in init network ACC CA time_server init_db freeradius chilli e2guardian antivirus tinyproxy ulogd nfsen vnstat dnsmasq BL cron fail2ban gammu_smsd msec letsencrypt post_install
2295,10 → 2296,10
then
$DIR_SCRIPTS/alcasar-conf.sh --create
else
rm -f /tmp/alcasar-conf*
rm -f /var/tmp/alcasar-conf*
fi
# Uninstall the running version
$DIR_SCRIPTS/alcasar-uninstall.sh -full
$DIR_DEST_BIN/alcasar-uninstall.sh -full
;;
*)
echo "Argument inconnu :$1";