Subversion Repositories ALCASAR

Compare Revisions

Regard whitespace Rev 3110 → Rev 3111

/scripts/alcasar-rpm.sh
39,6 → 39,10
 
rpm_error ()
{
# restore previous rpm conf file & removed RPMs
[ -e /etc/urpmi/urpmi.cfg.old ] && mv /etc/urpmi/urpmi.cfg.old /etc/urpmi/urpmi.cfg
urpmi --no-verify-rpm --auto rpms/$ARCH/wkhtmltopdf*.rpm
urpmi --auto --quiet freeradius-ldap lighttpd-mod_auth
echo
if [ $Lang == "fr" ]
then
76,6 → 80,7
urpmi --no-verify-rpm --auto rpms/$ARCH/wget*.rpm
 
# Set the RPM repository (if not already set)
cp /etc/urpmi/urpmi.cfg /etc/urpmi/urpmi.cfg.old
ACTIVE_REPO=`cat /etc/urpmi/urpmi.cfg|grep "mageia.org"|wc -l`
MIRROR_NBR=3
# For French
118,6 → 123,7
done
if [ "$response" = "n" ] || [ "$response" = "N" ]
then
[ -e /etc/urpmi/urpmi.cfg.old ] && mv /etc/urpmi/urpmi.cfg.old /etc/urpmi/urpmi.cfg # restore previous rpm conf file
exit 1
fi
fi
132,7 → 138,7
fi
 
# Remove some RPMs in order to avoid error and automatic update
urpme wkhtmltopdf freeradius-ldap
urpme wkhtmltopdf freeradius-ldap lighttpd-mod_auth
 
# download the kernel used by ALCASAR
if [ $Lang == "fr" ]