533,8 → 533,8 |
PRIVATE_IP_MASK=$DEFAULT_PRIVATE_IP_MASK |
fi |
else |
PRIVATE_IP_MASK=`grep ^PRIVATE_IP= conf/etc/alcasar.conf|cut -d"=" -f2` |
rm -f conf/etc/alcasar.conf |
PRIVATE_IP_MASK=`grep ^PRIVATE_IP= /var/tmp/conf/etc/alcasar.conf|cut -d"=" -f2` |
rm -rf /var/tmp/conf |
fi |
# Define LAN side global parameters |
hostnamectl set-hostname $HOSTNAME.$DOMAIN |
2381,36 → 2381,43 |
read |
fi |
# Test if manual update |
if [ -e /var/tmp/alcasar-conf*.tar.gz ] && [ "$mode" == "install" ] |
if [ -e /var/tmp/alcasar-conf.tar.gz ] && [ "$mode" == "install" ] |
then |
header_install |
# 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` |
UPD_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f3|cut -c1` |
if [ $Lang == "fr" ] |
then echo "Le fichier de configuration d'une version $MAJ_PREVIOUS_VERSION.$MIN_PREVIOUS_VERSION.$UPD_PREVIOUS_VERSION a été trouvé"; |
else echo "The configuration file of an old version has been found"; |
fi |
response=0 |
PTN='^[oOnNyY]?$' |
until [[ "$response" =~ $PTN ]] |
do |
cd /var/tmp |
tar -xf /var/tmp/alcasar-conf.tar.gz conf/etc/alcasar.conf |
cd $DIR_INSTALL |
if [ "mode" == "install" ] |
then |
header_install |
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` |
UPD_PREVIOUS_VERSION=`echo $PREVIOUS_VERSION|cut -d"." -f3|cut -c1` |
if [ $Lang == "fr" ] |
then echo -n "Voulez-vous l'utiliser (O/n)? "; |
else echo -n "Do you want to use it (Y/n)?"; |
fi |
read response |
if [ "$response" = "n" ] || [ "$response" = "N" ] |
then rm -f /var/tmp/alcasar-conf* |
then echo "Le fichier de configuration d'une version $MAJ_PREVIOUS_VERSION.$MIN_PREVIOUS_VERSION.$UPD_PREVIOUS_VERSION a été trouvé"; |
else echo "The configuration file of an old version has been found"; |
fi |
done |
response=0 |
PTN='^[oOnNyY]?$' |
until [[ "$response" =~ $PTN ]] |
do |
if [ $Lang == "fr" ] |
then echo -n "Voulez-vous l'utiliser (O/n)? "; |
else echo -n "Do you want to use it (Y/n)?"; |
fi |
read response |
if [ "$response" = "n" ] || [ "$response" = "N" ] |
then |
rm -f /var/tmp/alcasar-conf* |
rm -rf /var/tmp/conf |
fi |
done |
fi |
fi |
# Test if update |
if [ -e /var/tmp/alcasar-conf* ] |
if [ -e /var/tmp/alcasar-conf.tar.gz ] |
then |
if [ $Lang == "fr" ] |
then echo "#### Installation avec mise à jour ####"; |