Commit ec04840a authored by PENGUEN Julien's avatar PENGUEN Julien
Browse files

ajout test sur volume monté version linux

parent e8403806
......@@ -517,7 +517,7 @@ case $taille in
elif [ "${tempo_arg_weight[0]}" -eq 2 ]; then
#case '--survey', '--area' ,'--angular'
#'--resolution_line', '--resolution_col',
#'--nb_tile_line','--nb_tile_col'
#'--nb_tile_line','--nb_tile_col' '--mount'
tab2_arg_keys[0]="--no_select"
tab2_arg_values[0]="$ALADIN_VERSION"
......@@ -824,14 +824,15 @@ sort_arg_weight=( ${tab_sort_arg_weight// / } )
#check volume_mount input args
VOLUME_MOUNT=`function_check_and_replace "${sort_arg_keys[*]}" "${sort_arg_values[*]}" "--mount" $VOLUME_MOUNT`
echo "VOLUME_MOUNT=$VOLUME_MOUNT"
if [[ -d $VOLUME_MOUNT && $VOLUME_MOUNT != "" ]]; then
echo "=> $VOLUME_MOUNT exist"
else
function_message "TYPE_FILE_ERROR" "$VOLUME_MOUNT not found" "--mount"
exit 0
if [$VOLUME_MOUNT != "NONE" ];then
if [[ -d $VOLUME_MOUNT ]]; then
echo "=> $VOLUME_MOUNT exist"
else
function_message "TYPE_FILE_ERROR" "$VOLUME_MOUNT not found" "--mount"
exit 0
fi
fi
#------------------------------#
......@@ -1203,7 +1204,7 @@ case ${sort_arg_keys[0]} in
script_images[$k]="macro "${area_ajs[$k]}
script_montages[$k]="montage -geometry ${RESOLUTION_BY_LINE}x${RESOLUTION_BY_COL} -tile ${NB_TILE_BY_LINE}x${NB_TILE_BY_COL} ${images_folder[$k]}/*jpg ${montages_folder[$k]}/${list_zone[$k]}.png"
if [[ "${sort_arg_keys[@]}" =~ "--mount" && $VOLUME_MOUNT != "" ]]; then
if [[ "${sort_arg_keys[@]}" =~ "--mount" && $VOLUME_MOUNT != "NONE" ]]; then
sudo docker run --name photos_montage_aladin --rm -v /tmp/.X11-unix:/tmp/.X11-unix -v $HOME:$HOME -v ${VOLUME_MOUNT}:"/mnt/${VOLUME_MOUNT}" --network host -e DISPLAY=$DISPLAY -e USER=$USER -e HOME=$HOME image_photos_montage_aladin-${version} /bin/bash -c "java -jar /var/aladin/Aladin-${version}.jar -nogui -trace -script=${script_images[$k]};${script_montages[$k]} " > ${log_aladin_file[$k]} 2>&1
......@@ -1252,6 +1253,14 @@ case ${sort_arg_keys[0]} in
echo "" >> ${infos_file[$k]}
echo "OPTIONS: $@" >> ${infos_file[$k]}
echo "" >> ${infos_file[$k]}
if [ $VOLUME_MOUNT != "NONE" ];then
echo "VOLUME MOUNTED: $VOLUME_MOUNT" >> ${infos_file[$k]}
else
echo "VOLUME MOUNTED: NO VOLUME" >> ${infos_file[$k]}
fi
echo "" >> ${infos_file[$k]}
echo "Input surveys file: $INPUT_FILE_SURVEYS" >> ${infos_file[$k]}
echo "" >> ${infos_file[$k]}
echo "number of surveys: $nb_lines_survey" >> ${infos_file[$k]}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment