addons/dirige-DAM: make it more generic

NEWS

@@ -5,8 +5,9 @@
 	-- addons/intelmpi-slurm.ad: switch to intelmpi mode when intel|intel64|intelmpi is
 	   detected in mpirun path
 	-- addons/intelmpi-slurm.ad: wait for nodes availability
-    -- addons/preload: allows prepending LD_PRELOAD env variable with the
-       content of BRIDGE_MPRUN_PRELOAD when set
+	-- addons/preload: allows prepending LD_PRELOAD env variable with the
+      	   content of BRIDGE_MPRUN_PRELOAD when set
+	-- addons/dirige-DAM: make it more generic
 
 * Changes in bridge-1.5.5
 =========================

scripts/addons/dirige-DAM.ad

@@ -89,18 +89,26 @@ function bridge_addon_msub_alteropt {
 	if [[ $? -eq 0 ]]
 	    then
 
+	    if [[ -z ${BRIDGE_DIRIGE_CMD} ]]
+	    then
+		BRIDGE_DIRIGE_CMD="/usr/local/bridge-dam/dirige"
+	    fi
+	    if [[ -z ${BRIDGE_DIRIGE_SPOOLDIR} ]]
+	    then
+		BRIDGE_DIRIGE_SPOOLDIR="${CCC_SPOOLDIR}/listings/files"
+	    fi
+
 	    # on initialise les repertoires de travail necessaire a l'aide de la
 	    # commande dirige
-	    /usr/local/bridge/dam/dirige -I
+	    ${BRIDGE_DIRIGE_CMD} -I
 
-	    typeset user_spooldir="/cea/spool/home/$(id -un)/listings/files"
-	    if [[ ! -d ${user_spooldir} ]]
+	    if [[ ! -d ${BRIDGE_DIRIGE_SPOOLDIR} ]]
 		then
-		${ERROR} "dirige requested but user spool directory '${user_spooldir}' does not exist. fatal"
+		${ERROR} "dirige requested but user spool directory '${BRIDGE_DIRIGE_SPOOLDIR}' does not exist. fatal"
 		exit 1
 	    else
-		export BRIDGE_MSUB_STDOUT="${user_spooldir}/${BRIDGE_MSUB_REQNAME}.%j.o"
-		export BRIDGE_MSUB_STDERR="${user_spooldir}/${BRIDGE_MSUB_REQNAME}.%j.e"
+		export BRIDGE_MSUB_STDOUT="${BRIDGE_DIRIGE_SPOOLDIR}/${BRIDGE_MSUB_REQNAME}.%j.o"
+		export BRIDGE_MSUB_STDERR="${BRIDGE_DIRIGE_SPOOLDIR}/${BRIDGE_MSUB_REQNAME}.%j.e"
 		${LOGGER} "dirige mode activated"
 	    fi