Changeset 111d25a for common/libs/func_compare.sh

Timestamp:

09/27/2007 07:26:14 PM (17 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

experimental

Children:

aafcfa9

Parents:

f9bfa72

Message:

Revised func_compare.sh

File:

• common/libs/func_compare.sh (modified) (6 diffs)

common/libs/func_compare.sh

@@ -58 +58 @@
   local    ROOT_DIR=/
   local DEST_TOPDIR=/${SCRIPT_ROOT}
-  local   ICALOGDIR=/${SCRIPT_ROOT}/logs/ICA
-  local FARCELOGDIR=/${SCRIPT_ROOT}/logs/farce
+  local   ICALOGDIR=/${SCRIPT_ROOT}/${LOGDIRBASE}/ICA
+  local FARCELOGDIR=/${SCRIPT_ROOT}/${LOGDIRBASE}/farce
 
   if [[ "$RUN_ICA" = "y" ]] ; then
@@ -65 +65 @@
 (
     cat << EOF
-        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >>logs/\$@ 2>&1 && \\
-        extras/do_ica_prep $DEST_ICA/$ITERATION >>logs/\$@ 2>&1
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_ICA/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 && \\
+        extras/do_ica_prep $DEST_ICA/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -78 +78 @@
 (
     cat << EOF
-        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >>logs/\$@ 2>&1 && \\
-        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >>logs/\$@ 2>&1
+        @extras/do_copy_files "$PRUNEPATH" $ROOT_DIR $DEST_FARCE/$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1 && \\
+        extras/filelist $DEST_FARCE/$ITERATION $DEST_FARCE/filelist-$ITERATION >> ${LOGDIRBASE}/\$@ 2>&1
 EOF
 ) >> $MKFILE.tmp
@@ -91 +91 @@
 wrt_do_ica_work() {                #
 #----------------------------------#
-  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >>logs/\$@ 2>&1" >> $MKFILE.tmp
+  echo -e "\t@extras/do_ica_work $1 $2 $ICALOGDIR $3 >> ${LOGDIRBASE}/\$@ 2>&1" >> $MKFILE.tmp
 }
 
@@ -102 +102 @@
   local ITEDIR=$3/$2
   local ITEFILE=$3/filelist-$2
-  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >>logs/\$@ 2>&1" >> $MKFILE.tmp
+  echo -e "\t@extras/farce --directory $OUTPUT $PREDIR $PREFILE $ITEDIR $ITEFILE >> ${LOGDIRBASE}/\$@ 2>&1" >> $MKFILE.tmp
 }
 
@@ -110 +110 @@
   local build=build_$1
   local file
+  local ch_order=${PREV%%_*}
 
+  echo -e "\t@cd /\$(SCRIPT_ROOT)/${LOGDIRBASE} && mkdir $build && mv -f ${ch_order}_* $build" >> $MKFILE.tmp
+
+  if [ ! "${1}" = "1" ] ; then
 (
     cat << EOF
-        @cd logs && \\
-        mkdir $build && \\
-        mv -f ${system_build} $build && \\
-        if [ ! $build = build_1 ] ; then \\
-          cd $build && \\
-          for file in \`ls .\` ; do \\
-            mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
-          done ; \\
-        fi ;
-        @cd /\$(SCRIPT_ROOT)
-        @if [ -d test-logs ] ; then \\
-          cd test-logs && \\
-          mkdir $build && \\
-          mv -f ${system_build} $build && \\
-          if [ ! $build = build_1 ] ; then \\
-            cd $build && \\
-            for file in \`ls .\` ; do \\
-              mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
-            done ; \\
-          fi ; \\
-          cd /\$(SCRIPT_ROOT) ; \\
-        fi ;
+        @cd $build && \\
+        for file in \`ls .\` ; do \\
+          mv -f \$\$file \`echo \$\$file | sed -e 's,-$build,,'\` ; \\
+        done ;
 EOF
 ) >> $MKFILE.tmp
+  fi
+
+  if [ ${CONFIG_TESTS} = "y" ] ; then
+    echo -e "\t@cd /\$(SCRIPT_ROOT)/${TESTLOGDIRBASE} && mkdir $build && mv -f ${ch_order}_* $build" >> $MKFILE.tmp
+  fi
+
+  echo -e "\t@cd /\$(SCRIPT_ROOT)" >> $MKFILE.tmp
 }