Subversion Repositories ALCASAR

Compare Revisions

Ignore whitespace Rev 2458 → Rev 2457

/alcasar.sh
168,20 → 168,16
else echo -n "ALCASAR Version "; echo -n $current_version ; echo " is already installed";
fi
response=0
PTN='^[12]$'
PTN='^[oOnNyY]$'
until [[ $(expr $response : $PTN) -gt 0 ]]
do
if [ $Lang == "fr" ]
then
echo "Effectuer une mise à jour : tapez '1'"
echo -n "Effectuer une réinstallation : Tapez '2' : "
else
echo "Perform an update : Hit '1'"
echo -n "Perform a reinstallation : Hit '2' : "
then echo -n "Voulez-vous effectuer une mise à jour (O/n)? ";
else echo -n "Do you want to update (Y/n)?";
fi
read response
done
if [ "$response" = "2" ]
if [ "$response" = "n" ] || [ "$response" = "N" ]
then
rm -f /tmp/alcasar-conf*
else
509,7 → 505,7
PRIVATE_MAC=`/usr/sbin/ip link show $INTIF | grep ether | cut -d" " -f6| sed 's/:/-/g'| awk '{print toupper($0)}'` # MAC address of INTIF
# Define Internet parameters
DNS1=`grep ^nameserver /etc/resolv.conf|awk -F" " '{print $2}'|head -n 1` # 1st DNS server
if [ "$DNS1" == "" ] || [ "$DNS1" == "127.0.0.1" ]
if [ "$DNS1" != "" ] && [ "$DNS1" != "127.0.0.1" ]
then
if [ $Lang == "fr" ]
then
2334,13 → 2330,8
fi
if [ -e $CONF_FILE ]
then
# Uninstall or update the running version
if [ "$mode" == "update" ]
then
$DIR_SCRIPTS/alcasar-uninstall.sh -update
else
$DIR_SCRIPTS/alcasar-uninstall.sh -full
fi
# Uninstall the running version
$DIR_SCRIPTS/alcasar-uninstall.sh -update
fi
# Test if manual update
if [ -e /tmp/alcasar-conf*.tar.gz ] && [ "$mode" == "install" ]