diff --git a/conf/init.conf b/conf/init.conf index c9e2b9c..8a145af 100755 --- a/conf/init.conf +++ b/conf/init.conf @@ -28,6 +28,7 @@ # la fonction logname ne renvoi rien ? # 2.1.2 29-06-2017 - Emmanuel Confrere - Ano : Erreur : logname() renvoi null si connexion via sshd # Remplacement de logname() par /etc/proc/self/loginuid +# 2.2.0 19-02-2018 - Doug Le Tough - Evo : Definition de ${SH_TMP_DIR} constitue de ${NC_EXPL_TMP}/${SH_SESSION_ID} ## ----------------------------------------------------------------------------- ## Ce fichier contient les varaibles de fonctionement commune au script du socle ## Il est charge systematiquement au debut de chaque script @@ -109,9 +110,12 @@ SH_CPT_SEMAPHORE=1 # Valeur d execution du # - Connection a la base de referencement [ -z "${SH_CNX_REF}" ] && SH_CNX_REF=${SH_CNX_REF:="cmdb/IRji_5#1O@refpro"} +# - Definition du repertoire temporaire ${SH_TMPDIR} +SH_TMP_DIR="${NC_EXPL_TMP}/${SH_SESSION_ID}" + # Globalisation des variables export SH_FICLOG SH_FICCPT SH_CNX_REF SH_INDENT_MSG SH_SESSION_ID SH_NIV_DEBUG SH_SILENCE -export SH_RETENTION_CPT SH_RETENTION_LOG SH_LOGUSER SH_EXECUSER +export SH_RETENTION_CPT SH_RETENTION_LOG SH_LOGUSER SH_EXECUSER SH_TMP_DIR # - Chargement de l'environement specifique au script if [ -f ${SH_FICCFG} ] diff --git a/lib/erreur.lib b/lib/erreur.lib index 48c094d..971a0c2 100755 --- a/lib/erreur.lib +++ b/lib/erreur.lib @@ -34,6 +34,7 @@ # 1.2.1 10-03-2017 - Emmanuel Confrere - Ano : Suppression des variables NC_EXPL_* # 1.2.2 06-04-2017 - Emmanuel Confrere - Ano : Degradation de performance serveur (Cf. DBA-2458) # Suppression de la commande "find" +# 1.3.0 19-02-2017 - Doug Le Tough - Evo : Suppression systematique du repertoire ${SH_TMP_DIR} en fin de script ##---------------------------------------------------------------------------- function fct_erreur @@ -98,6 +99,7 @@ case "${L_Cmd}" in if [ -n "${NC_EXPL_TMP}" -a -n "${SH_SESSION_ID}" -a "${NC_EXPL_TMP}" != "/" -a "${NC_EXPL_TMP}" != "." ] then rm -f "${NC_EXPL_TMP}/*${SH_SESSION_ID}*" + rm -Rf ${SH_TMP_DIR} else fct_message -debug 0 " Variable de session incoherente : NC_EXPL_TMP = ${NC_EXPL_TMP} & SH_SESSION_ID = ${SH_SESSION_ID}" fi diff --git a/lib/params.lib b/lib/params.lib index f798e23..1bbf715 100755 --- a/lib/params.lib +++ b/lib/params.lib @@ -49,8 +49,19 @@ # Les variables SH_ARGS et SH_ARG_