Commit 499b7d89 authored by PENGUEN Julien's avatar PENGUEN Julien

ajout message erreur pour TYPE_MOUNT_ERROR version macos

parent 289b0174
......@@ -25,6 +25,16 @@ function_message()
echo -e "WARNING => ${message}"
echo -e "=========================================================${COLOR_OFF}"
elif [ "$type_message" == "TYPE_MOUNT_ERROR" ]; then
echo ""
echo "------------------------------------"
echo ""
echo -e "${RED}========================================================="
echo -e "${message}"
echo -e "on volume mounted : ${option}"
echo -e "=========================================================${COLOR_OFF}"
elif [ "$type_message" == "TYPE_FILE_ERROR" ]; then
echo ""
......@@ -1347,7 +1357,7 @@ case ${sort_arg_keys[0]} in
#check OUTPUT_FOLDER_ON_VOLUME_MOUNT
if [ $OUTPUT_FOLDER_ON_VOLUME_MOUNT == "TRUE" ]; then
container_mount="/mnt"
container_mount="/mnt/"
new_main_folder=${container_mount}${OUTPUT_FOLDER_MACOS}"/datas_photos_montage_aladin"
else
container_mount=""
......@@ -1364,13 +1374,6 @@ case ${sort_arg_keys[0]} in
log_aladin_file[$k]=${area_folder[$k]}"/"${list_zone[$k]}".log"
infos_file[$k]=${area_folder[$k]}"/infos_"${list_zone[$k]}".txt"
new_area_folder[$k]=${new_main_folder}"/"${list_zone[$k]}
new_tempo_folder[$k]=${new_area_folder[$k]}
new_images_folder[$k]=${new_area_folder[$k]}"/images"
new_montages_folder[$k]=${new_area_folder[$k]}"/montages"
new_area_ajs[$k]=${new_tempo_folder[$k]}"/area_"${list_zone[$k]}".ajs"
#------------------------#
if [ -d ${area_folder[$k]} ]; then
if [ $force == 'TRUE' ]; then
......@@ -1404,7 +1407,7 @@ case ${sort_arg_keys[0]} in
else
echo -e "=> ${RED}WARNING${COLOR_OFF} : ${area_ajs[$k]} not found"
echo "=> construction of ${area_ajs[$k]} in progress ..."
function_create_ajs_file ${INPUT_FILE_SURVEYS} ${area_ajs[$k]} ${list_zone[$k]} ${list_ra[k]} ${list_dec[k]} ${new_images_folder[$k]}
function_create_ajs_file ${INPUT_FILE_SURVEYS} ${area_ajs[$k]} ${list_zone[$k]} ${list_ra[k]} ${list_dec[k]} ${container_mount}${images_folder[$k]}
echo "=> construction of ${area_ajs[$k]} OK"
rm -rf ${images_folder[$k]}
rm -rf ${montages_folder[$k]}
......@@ -1466,7 +1469,7 @@ case ${sort_arg_keys[0]} in
rm ${log_aladin_file[$k]}
echo "=> construction of ${area_ajs[$k]} in progress ..."
function_create_ajs_file ${INPUT_FILE_SURVEYS} ${area_ajs[$k]} ${list_zone[$k]} ${list_ra[k]} ${list_dec[k]} ${new_images_folder[$k]}
function_create_ajs_file ${INPUT_FILE_SURVEYS} ${area_ajs[$k]} ${list_zone[$k]} ${list_ra[k]} ${list_dec[k]} ${container_mount}${images_folder[$k]}
echo "=> construction of ${area_ajs[$k]} OK"
state="RUN"
......@@ -1493,6 +1496,11 @@ case ${sort_arg_keys[0]} in
#construction of docker script and montage
echo "=> Construction in progress ..."
new_area_folder[$k]=${new_main_folder}"/"${list_zone[$k]}
new_tempo_folder[$k]=${new_area_folder[$k]}
new_images_folder[$k]=${new_area_folder[$k]}"/images"
new_montages_folder[$k]=${new_area_folder[$k]}"/montages"
new_area_ajs[$k]=${new_tempo_folder[$k]}"/area_"${list_zone[$k]}".ajs"
#------------------------#
script_images[$k]="macro "${new_area_ajs[$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