corrections + amelioration visuelle

README.md

@@ -99,7 +99,7 @@ bash --version
 
 1. Clone the photos_montage_aladin repository:
 ```
-git@gitlab.lam.fr:CeSam_TOOLS/photos_montage_aladin.git
+git clone git@gitlab.lam.fr:CeSam_TOOLS/photos_montage_aladin.git
 ```
 
 2. Launch the `photos_montage_aladin.sh` (or `photos_montage_aladin_osx.sh` for MAC-OS users) to create photos_montage_aladin docker image, build and launch photos_montage_aladin docker container :

photos_montage_aladin.sh

@@ -732,8 +732,6 @@ function_build_image()
           tempo=$(curl -s ${ALADIN_URL}"/nph-aladin.pl?frame=downloading" | sed '/Official version/!d' | cut -d">" -f3)
 
           aladin_last_number_version=$(echo ${tempo:1})
-          echo "${aladin_last_number_version}"
-          echo "${version}"
           #----------------------------------------#
 
           if [ ${aladin_last_number_version} == ${version} ]; then
@@ -1054,11 +1052,11 @@ case ${sort_arg_keys[0]} in
 
       fi
 
-      echo ''
-      echo '------------------------------------'
-      echo '        Photos Montage Aladin       '
-      echo ''
-      echo '- aladin version: ' ${version}
+      echo -e "${BOLD_BEGIN}"
+      echo -e "------------------------------------"
+      echo -e "        Photos Montage Aladin       "
+      echo -e ""
+      echo -e "- aladin version: ${version}${BOLD_END}"
 
       #----------------------------------------#
       #call function function_jar_updated_search
@@ -1075,9 +1073,9 @@ case ${sort_arg_keys[0]} in
       else
         #case no update
 
-        echo ''
-        echo '------------------------------------'
-        echo ''
+        echo -e "${BOLD_BEGIN}"
+        echo -e "------------------------------------"
+        echo -e "${BOLD_END}"
 
       fi
 
@@ -1136,7 +1134,7 @@ case ${sort_arg_keys[0]} in
       do
 
       echo "============================="
-      echo "${list_zone[$k]}"
+      echo -e "${BOLD_BEGIN}${list_zone[$k]}${BOLD_END}"
       echo "============================="
 
       #------------------------#
@@ -1200,10 +1198,17 @@ case ${sort_arg_keys[0]} in
           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]} ${images_folder[$k]}
           echo "=> construction of ${area_ajs[$k]} OK"
+
           rm -rf ${images_folder[$k]}
           rm -rf ${montages_folder[$k]}
-          rm ${infos_file[$k]}
-          rm ${log_aladin_file[$k]}
+
+          if [ -f ${infos_file[$k]} ]; then
+            rm ${infos_file[$k]}
+          fi
+
+          if [ -f ${log_aladin_file[$k]} ]; then
+            rm ${infos_file[$k]}
+          fi
 
         fi
 
@@ -1290,7 +1295,7 @@ case ${sort_arg_keys[0]} in
             sudo docker run --name photos_montage_aladin --rm -v /tmp/.X11-unix:/tmp/.X11-unix -v $HOME:$HOME --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
           fi
 
-          echo "=> Construction OK"
+          echo -e "=> ${GREEN}INFOS${COLOR_OFF} : Construction OK"
           #----------------------------------------#
           echo ""
           echo "=> For more informations about the construction please see:"

photos_montage_aladin_osx.sh

@@ -1069,11 +1069,11 @@ case ${sort_arg_keys[0]} in
 
       fi
 
-      echo ''
-      echo '------------------------------------'
-      echo '        Photos Montage Aladin       '
-      echo ''
-      echo '- aladin version: ' ${version}
+      echo -e "${BOLD_BEGIN}"
+      echo -e "------------------------------------"
+      echo -e "        Photos Montage Aladin       "
+      echo -e ""
+      echo -e "- aladin version: ${version}${BOLD_END}"
 
       #----------------------------------------#
       #call function function_jar_updated_search
@@ -1090,9 +1090,9 @@ case ${sort_arg_keys[0]} in
       else
         #case no update
 
-        echo ''
-        echo '------------------------------------'
-        echo ''
+        echo -e "${BOLD_BEGIN}"
+        echo -e "------------------------------------"
+        echo -e "${BOLD_END}"
 
       fi
 
@@ -1150,7 +1150,7 @@ case ${sort_arg_keys[0]} in
       do
 
       echo "============================="
-      echo "${list_zone[$k]}"
+      echo -e "${BOLD_BEGIN}${list_zone[$k]}${BOLD_END}"
       echo "============================="
 
       #------------------------#
@@ -1216,6 +1216,14 @@ case ${sort_arg_keys[0]} in
           echo "=> construction of ${area_ajs[$k]} OK"
           rm -rf ${images_folder[$k]}
           rm -rf ${montages_folder[$k]}
+
+          if [ -f ${infos_file[$k]} ]; then
+            rm ${infos_file[$k]}
+          fi
+
+          if [ -f ${log_aladin_file[$k]} ]; then
+            rm ${infos_file[$k]}
+          fi
         fi
 
         #---------------------------#
@@ -1316,7 +1324,7 @@ case ${sort_arg_keys[0]} in
           fi
           xhost -
 
-          echo "=> Construction OK"
+          echo -e "=> ${GREEN}INFOS${COLOR_OFF} : Construction OK"
           #----------------------------------------#
           echo ""
           echo "=> For more informations about the construction please see:"