changeset 15:a88ff1d75e71 draft

Refactored and updated.
author Pavel Tisnovsky <ptisnovs@redhat.com>
date Fri, 18 Apr 2014 11:39:34 +0200
parents 711b58cbbb72
children 7aa7620641a5
files ChangeLog tck7/scripts/cur_date.sh tck7/scripts/cur_date_week.sh
diffstat 3 files changed, 72 insertions(+), 30 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 17 17:12:39 2014 +0200
+++ b/ChangeLog	Fri Apr 18 11:39:34 2014 +0200
@@ -1,3 +1,9 @@
+2014-04-18  Pavel Tisnovsky  <ptisnovs@redhat.com>
+
+	* tck7/scripts/cur_date.sh:
+	* tck7/scripts/cur_date_week.sh:
+	Refactored and updated.
+
 2014-04-17  Pavel Tisnovsky  <ptisnovs@redhat.com>
 
 	* tck7/build_all.sh:
--- a/tck7/scripts/cur_date.sh	Thu Apr 17 17:12:39 2014 +0200
+++ b/tck7/scripts/cur_date.sh	Fri Apr 18 11:39:34 2014 +0200
@@ -42,27 +42,45 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
 YESTERDAY=`date --date=1\ day\ ago +%Y%m%d`
 TODAY=`date +%Y%m%d`
 
-cd ${JCKROOT}/work
+function renameWorkDirs()
+{
+    cd ${WORK_DIR}
 
-for i in `seq 1 3`
-do
-    echo $YESTERDAY-$i
-    echo $TODAY-$i
-    mv $YESTERDAY-$i $TODAY-$i
-done
+    for i in `seq 1 3`
+    do
+        echo $YESTERDAY-$i
+        echo $TODAY-$i
+        mv $YESTERDAY-$i $TODAY-$i
+    done
+}
+
+function renameResultDirs()
+{
+    cd ${RESULT_DIR}
 
-cd ${JCKROOT}/results
+    for i in `seq 1 3`
+    do
+        echo $YESTERDAY-$i
+        echo $TODAY-$i
+        mv $YESTERDAY-$i $TODAY-$i
+    done
+}
 
-for i in `seq 1 3`
-do
-    echo $YESTERDAY-$i
-    echo $TODAY-$i
-    mv $YESTERDAY-$i $TODAY-$i
-done
+function main()
+{
+    renameWorkDirs
+    renameResultDirs
+}
 
+main
+
--- a/tck7/scripts/cur_date_week.sh	Thu Apr 17 17:12:39 2014 +0200
+++ b/tck7/scripts/cur_date_week.sh	Fri Apr 18 11:39:34 2014 +0200
@@ -42,27 +42,45 @@
 # Author: Pavel Tisnovsky
 # e-mail: ptisnovs@redhat.com
 
-JCKROOT=`cat ../jck.dir`
+JCK_ROOT_DIR=`cat ../jck.dir`
+JCK_VERSION=7
+JCK_DIR=${JCK_ROOT_DIR}/${JCK_VERSION}
+WORK_DIR=${JCK_ROOT_DIR}/work
+RESULT_DIR=${JCK_ROOT_DIR}/results
 DAILY_TESTS_DIR=`cat ../dailytests.dir`
 
 YESTERDAY=`date --date=3\ day\ ago +%Y%m%d`
 TODAY=`date +%Y%m%d`
 
-cd ${JCKROOT}/work
+function renameWorkDirs()
+{
+    cd ${WORK_DIR}
 
-for i in `seq 1 3`
-do
-    echo $YESTERDAY-$i
-    echo $TODAY-$i
-    mv $YESTERDAY-$i $TODAY-$i
-done
+    for i in `seq 1 3`
+    do
+        echo $YESTERDAY-$i
+        echo $TODAY-$i
+        mv $YESTERDAY-$i $TODAY-$i
+    done
+}
+
+function renameResultDirs()
+{
+    cd ${RESULT_DIR}
 
-cd ${JCKROOT}/results
+    for i in `seq 1 3`
+    do
+        echo $YESTERDAY-$i
+        echo $TODAY-$i
+        mv $YESTERDAY-$i $TODAY-$i
+    done
+}
 
-for i in `seq 1 3`
-do
-    echo $YESTERDAY-$i
-    echo $TODAY-$i
-    mv $YESTERDAY-$i $TODAY-$i
-done
+function main()
+{
+    renameWorkDirs
+    renameResultDirs
+}
 
+main
+