improved and corrected dependency system, added option to disable it
This commit is contained in:
16
init.sh
16
init.sh
@@ -147,9 +147,23 @@ fi
|
||||
# Run prechecks
|
||||
if [[ JUMP != true ]]; then
|
||||
tmpfile=$(mktemp /tmp/init-XXXXXX)
|
||||
if [[ -n $MANUAL_MODULE_LIST ]]; then
|
||||
prnt W "La vérification des dépendences est désactivé avec une liste manuelle de module."
|
||||
fi
|
||||
if [[ $NO_DEPS == true ]]; then
|
||||
prnt W "La vérification des dépendences à été désactivée manuellement."
|
||||
fi
|
||||
if [[ $RESUME == true ]]; then
|
||||
cat $STAGE_FILE >> $tmpfile
|
||||
fi
|
||||
for mod in $MODULE_LIST; do
|
||||
version=VER_$mod
|
||||
if [[ $RESUME == true ]] && [[ $(grep $mod $STAGE_FILE) ]]; then
|
||||
prnt I "Vérification précédemment exécuté pour $mod version ${!version}."
|
||||
continue
|
||||
fi
|
||||
prnt I "Vérification initiale pour $mod version ${!version}..."
|
||||
if [[ -z $MANUAL_MODULE_LIST && $NO_DEPS != true ]]; then
|
||||
deps=DEP_$mod
|
||||
for dep in ${!deps}; do
|
||||
if [[ ! $(grep $dep $tmpfile) ]]; then
|
||||
@@ -158,6 +172,8 @@ if [[ JUMP != true ]]; then
|
||||
die 9
|
||||
fi
|
||||
done
|
||||
unset deps
|
||||
fi
|
||||
precheck_$mod
|
||||
echo $mod >> $tmpfile
|
||||
done
|
||||
|
||||
@@ -60,6 +60,9 @@ read_commandline()
|
||||
"-R"|"--no-root-check")
|
||||
export NO_ROOT_CHECK=true
|
||||
;;
|
||||
"-D"|"--no-deps")
|
||||
export NO_DEPS=true
|
||||
;;
|
||||
"-P"|"--no-proxy")
|
||||
export NO_PROXY=true
|
||||
;;
|
||||
@@ -76,7 +79,7 @@ read_commandline()
|
||||
if [[ $want_module == true ]]; then
|
||||
[[ $want_logfile == true ]] && synthax_error
|
||||
[[ $want_conffile == true ]] && synthax_error
|
||||
if [[ ! $MANUAL_MODULE_LIST ]]; then
|
||||
if [[ -z $MANUAL_MODULE_LIST ]]; then
|
||||
export MANUAL_MODULE_LIST=$opt
|
||||
want_module=false
|
||||
else
|
||||
@@ -87,7 +90,7 @@ read_commandline()
|
||||
elif [[ $want_logfile == true ]]; then
|
||||
[[ $want_module == true ]] && synthax_error
|
||||
[[ $want_conffile == true ]] && synthax_error
|
||||
if [[ ! $NEW_LOGFILE ]]; then
|
||||
if [[ -z $NEW_LOGFILE ]]; then
|
||||
export NEW_LOGFILE=$opt
|
||||
want_logfile=false
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user