Changeset 346

Timestamp:

09/09/10 15:42:12 (14 years ago)

Author:

mmaipsl

Message:

Correct some problem with ATLAS and MONITORING move.
Improve replacement of MONITORING html files.
Add environment PBS variable "reponse" to bypass asking erase OLD tree.

File:

• trunk/libIGCM/AA_move-and-rename (modified) (6 diffs)

trunk/libIGCM/AA_move-and-rename

@@ -32 +32 @@
 #-Q- sx8brodie # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.)
 #-Q- sx8brodie # @ notification = error
-#-Q- sx8brodie # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $MASTER ; $RebuildFrequency ; $StandAlone
+#-Q- sx8brodie # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $POST_DIR ; $MASTER ; $RebuildFrequency ; $StandAlone ; $reponse
 #-Q- aix6 #!/bin/ksh
 #-Q- aix6 #######################
@@ -47 +47 @@
 #-Q- aix6 # pour recevoir un mail en cas de depassement du temps Elapsed (ou autre pb.)
 #-Q- aix6 # @ notification = error
-#-Q- aix6 # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $MASTER ; $RebuildFrequency ; $StandAlone 
+#-Q- aix6 # @ environment  = $DEBUG_debug ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $REBUILD_DIR ; $RebuildFromArchive ; $MASTER ; $RebuildFrequency ; $StandAlone ; $reponse
 #-Q- aix6 # @ queue
 #-Q- sx8brodie # @ queue
@@ -231 +231 @@
 ########################################################################
 
-
 if [ ! -d ${SUBMIT_DIR} ]; then
     IGCM_debug_Print 0 "No ${SUBMIT_DIR}, we stop here"
@@ -471 +470 @@
 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS}
 if [ $? = 0 ] ; then
+#    REPLACE_sed ${NEW_R_SAVE}/${R_ATLAS}/*/*/index.html ${NEW_R_SAVE}/${R_ATLAS}
+
+    MY_DODS_Rm ${R_ATLAS}
+
     IGCM_sys_Mv ${R_SAVE}/${R_ATLAS} ${NEW_R_SAVE}/${R_ATLAS}
-#    REPLACE_sed ${NEW_R_SAVE}/${R_ATLAS}/*/*/index.html ${NEW_R_SAVE}/${R_ATLAS}
-
-    MY_DODS_Rm ${R_ATLAS}
 
     MY_DODS_Cp ${R_ATLAS}
@@ -484 +484 @@
 if [ $? = 0 ] ; then
     IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}
+    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/html
+    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/files
+    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/progress
+    IGCM_sys_MkdirArchive ${NEW_R_SAVE}/${R_MONITORING}/images
     REPLACE_sed ${R_SAVE}/${R_MONITORING}/index.html ${NEW_R_SAVE}/${R_MONITORING}
-    IGCM_sys_Mv ${R_SAVE}/${R_MONITORING} ${NEW_R_SAVE}
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/files/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/files
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/html/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/html
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/progress/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/progress
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/images/HEADER.html ${NEW_R_SAVE}/${R_MONITORING}/images
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/run.card ${NEW_R_SAVE}/${R_MONITORING}
+    REPLACE_sed ${R_SAVE}/${R_MONITORING}/config.card ${NEW_R_SAVE}/${R_MONITORING}
+    IGCM_sys_Cp -rp ${R_SAVE}/${R_MONITORING} ${NEW_R_SAVE}
 
     MY_DODS_Rm ${R_MONITORING}
+    IGCM_sys_Rm -rf ${R_SAVE}/${R_MONITORING}
 
     MY_DODS_Cp ${R_MONITORING}
@@ -523 +535 @@
 echo "\033[1;31mDo you REALLY want to erase all this directory ?"
 echo -n " Your answer (y/n) : \033[m"
-read reponse
+if [ X${reponse} = X ] ; then
+    read reponse
+fi
 case ${reponse} in