amelioration gestion racine du script
This commit is contained in:
1 parent
3d66a0ec78
commit
03ad7883a0
3 files changed
+26
-31
No files matched your search
@@ -1,14 +1,18 @@
|
|||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
#set -eo pipefail
|
#set -eo pipefail
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#variables
|
#variables
|
||||||
|
export ROOT_DIR=$(cd "$(dirname "$0")" && pwd)
|
||||||
|
|
||||||
|
|
||||||
function check_source
|
function check_source
|
||||||
{
|
{
|
||||||
source=$1
|
source=$1
|
||||||
if [[ -f "./sources/${source}" ]]; then
|
if [[ -f "${ROOT_DIR}/sources/couleurs.ksh" ]]; then
|
||||||
{
|
{
|
||||||
. ./sources/${source}
|
. "${ROOT_DIR}/sources/couleurs.ksh"
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -18,8 +22,6 @@ function check_source
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
check_source "couleurs.ksh"
|
check_source "couleurs.ksh"
|
||||||
|
|
||||||
|
|
||||||
@@ -36,11 +38,11 @@ read reponse
|
|||||||
case ${reponse} in
|
case ${reponse} in
|
||||||
|
|
||||||
1)
|
1)
|
||||||
. ./modules/AutoInstall/autoinstall.ksh
|
. ${ROOT_DIR}/modules/AutoInstall/autoinstall.ksh
|
||||||
;;
|
;;
|
||||||
|
|
||||||
2)
|
2)
|
||||||
. ./modules/AutoMaj/MAJ.ksh
|
. ${ROOT_DIR}/modules/AutoMaj/MAJ.ksh
|
||||||
;;
|
;;
|
||||||
|
|
||||||
0)
|
0)
|
||||||
|
|||||||
@@ -5,35 +5,23 @@
|
|||||||
#--------------------------------------------
|
#--------------------------------------------
|
||||||
|
|
||||||
#variables
|
#variables
|
||||||
emplacement_actuel=$(dirname "$(readlink -f "$0")")
|
|
||||||
fic_couleurs="${emplacement_actuel}/sources/couleurs.ksh"
|
|
||||||
fic_source="${emplacement_actuel}/modules/AutoInstall/sources/fonctions.ksh"
|
|
||||||
|
|
||||||
function verif_source
|
if [[ -z "${ROOT_DIR}" ]]; then
|
||||||
{
|
echo "Erreur : Veuillez lancer ce script via le menu.ksh principal."
|
||||||
fichier=$1
|
exit 1
|
||||||
|
fi
|
||||||
sources="${emplacement_actuel}/modules/AutoInstall"
|
|
||||||
|
|
||||||
echo "Emplacement = ${emplacement_actuel}"
|
dir_script=$(cd "$(dirname "$0")" && pwd)
|
||||||
echo "Sources = ${sources}"
|
|
||||||
echo "${fichier}"
|
|
||||||
|
|
||||||
|
# 2. On charge les couleurs (via la racine globale)
|
||||||
|
if [[ -f "${ROOT_DIR}/sources/couleurs.ksh" ]]; then
|
||||||
|
. "${ROOT_DIR}/sources/couleurs.ksh"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -f ${fichier} ]]; then
|
# 3. On charge ses propres fonctions
|
||||||
{
|
if [[ -f "${dir_script}/sources/fonctions.ksh" ]]; then
|
||||||
. ${fichier}
|
. "${dir_script}/sources/fonctions.ksh"
|
||||||
}
|
fi
|
||||||
else
|
|
||||||
{
|
|
||||||
echo "${ROUGE} Erreur : Impossible de charger les dependances ${fichier} ${RESET}"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
verif_source ${fic_couleurs}
|
|
||||||
verif_source ${fic_source}
|
|
||||||
|
|
||||||
# Recuperation de la distribution
|
# Recuperation de la distribution
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,11 @@
|
|||||||
#
|
#
|
||||||
###############################################################
|
###############################################################
|
||||||
|
|
||||||
|
if [[ -z "${ROOT_DIR}" ]]; then
|
||||||
|
echo "Erreur : Veuillez lancer ce script via le menu.ksh principal."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# ---------- Couleurs (facultatives) ----------
|
# ---------- Couleurs (facultatives) ----------
|
||||||
# Certaines consoles ne supportent pas tput, on prévoit un fallback vide.
|
# Certaines consoles ne supportent pas tput, on prévoit un fallback vide.
|
||||||
RED=$(tput setaf 1 2>/dev/null || printf '')
|
RED=$(tput setaf 1 2>/dev/null || printf '')
|
||||||
|
|||||||
Reference in new issue
Block a user