reorganized common repo, some minor modules improvements
This commit is contained in:
@@ -31,11 +31,11 @@ upgrade_dist()
|
||||
echo 'APT::AutoRemove::RecommendsImportant "false";' >> $norecommends
|
||||
echo 'APT::AutoRemove::SuggestsImportant "false";' >> $norecommends
|
||||
|
||||
prnt I "Configuration du proxy pour APT..."
|
||||
prnt I "Configuring proxy for APT..."
|
||||
if [[ -n $PROXYAPT ]]; then
|
||||
if [[ ! -d $(dirname $proxyfile) ]]; then
|
||||
mkdir -pv $(dirname $proxyfile) || (
|
||||
prnt E "Impossiblle de créer le répertoire d'accueil pour la configuration d'APT."
|
||||
prnt E "Impossible to create directory to receive APT configuration."
|
||||
die 60
|
||||
)
|
||||
fi
|
||||
@@ -45,32 +45,32 @@ upgrade_dist()
|
||||
echo "# Generated automatically on $(stdtime) by $0" > $proxyfile
|
||||
echo "Acquire::http::Proxy \"http://${http_proxy}\";" >> $proxyfile
|
||||
else
|
||||
prnt I "Pas de proxy configuré, ne fait rien."
|
||||
prnt I "No proxy configured, nothing to do."
|
||||
fi
|
||||
|
||||
# Remplace source.list from dist with ours (be smarter)
|
||||
installfile "pkgman/${SYS_DIST}_${SYS_VER}.list" /etc/apt/sources.list
|
||||
|
||||
prnt I "Mise à jour de la liste des paquets..."
|
||||
prnt I "Updating package list..."
|
||||
pkgupdt
|
||||
|
||||
prnt I "Application des mises à jour de paquets..."
|
||||
prnt I "Applying packages upgrades..."
|
||||
pkgupgd
|
||||
|
||||
prnt I "Suppression des paquets résiduels..."
|
||||
prnt I "Deleting no longer needed packages..."
|
||||
pkgautorm
|
||||
}
|
||||
|
||||
precheck_upgrade_dist()
|
||||
{
|
||||
prnt I "Vérification du réseau..."
|
||||
prnt I "Checking network connectivity..."
|
||||
|
||||
if [[ $(noerror wget -q --tries=10 --timeout=20 --spider http://www.cnrs.fr) != 0 ]]; then
|
||||
prnt E "It seems network configuration is not functionnal! Giving up."
|
||||
die 160
|
||||
fi
|
||||
if [[ -n $PROXYAPT && -z $PROXYAPT_PORT ]]; then
|
||||
prnt E "Un serveur proxy a été spécifié mais pas son port d'usage."
|
||||
prnt E "A proxy server have been specified but not its working port."
|
||||
die 160
|
||||
fi
|
||||
file_exists pkgman/${SYS_DIST}_${SYS_VER}.list
|
||||
|
||||
Reference in New Issue
Block a user