Task #3566: Merged trunk into branch

.gitattributes

@@ -3452,7 +3452,6 @@ MAC/Test/TestHarness/THPVSSBridge/src/THPVSSBridge_Protocol.prot -text svneol=na
 MAC/Test/TestHarness/TSE/doc/OTSE-UserManual.doc -text
 MAC/Test/TestHarness/TSE/doc/OTSE-UserManual.pdf -text
 MAC/Test/TestHarness/TSE/scripts/demo.tar.bz2 -text
-MAC/Tools/Clock/plotclock -text
 MAC/Tools/Clock/ppsctl.c -text
 MAC/Tools/NTP/PPSkit-light-alpha-3932m-2.6.17.8.diff -text
 MAC/Tools/NTP/kernel-2.6.18-NANO.config -text
@@ -3473,7 +3472,6 @@ MAC/Tools/NTP/timer.c -text
 MAC/Tools/NTP/timer.c.patch -text
 MAC/Tools/NTP/timex.h -text
 MAC/Tools/Rubidium/filter.py -text
-MAC/Tools/Rubidium/plotrubidium -text
 MAC/Tools/Rubidium/rlp.py -text
 MAC/Tools/Rubidium/rr.py -text
 MAC/Tools/Rubidium/rubidium -text

MAC/Tools/Clock/plotclock

 #!/bin/bash
 #
-# V1.0, M.J.Norden, 18-09-2012
+# V1.1, M.J.Norden, 02-11-2012
 # Usage: plotclock yyyymmdd
 #
 
@@ -8,7 +8,8 @@ if [ "$1" != "" ]; then
    cp /var/log/ntpstats/loopstats.$1 /localhome/data/loopstats
    
 else 
-   cp /var/log/ntpstats/loopstats /localhome/data/loopstats
+   now="`date +%Y%m%d`"
+   cp /var/log/ntpstats/loopstats.$now /localhome/data/loopstats
    echo "Usage: plotclock yyyymmdd"
    sleep 1
    

MAC/Tools/Rubidium/plotrubidium

 #!/bin/bash
 #
-# V1.0, M.J.Norden, 18-09-2012
+# V1.1, M.J.Norden, 02-11-2012
 # Usage: plotrubidium yyyymmdd
 #
 
@@ -8,7 +8,8 @@ if [ "$1" != "" ]; then
    cp /var/log/ntpstats/rubidium_log.$1 /localhome/data/rubidium_log
    
 else 
-   cp /var/log/ntpstats/rubidium_log /localhome/data/rubidium_log
+   now="`date +%Y%m%d`"
+   cp /var/log/ntpstats/rubidium_log.$now /localhome/data/rubidium_log
    echo "Usage: plotrubidium yyyymmdd"
    sleep 1