From 26d802985628616a0684268197389a05d0967ea0 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Fri, 2 Nov 2012 12:03:44 +0000
Subject: [PATCH] Task #3566: Merged trunk into branch
---
.gitattributes | 2 --
MAC/Tools/Clock/plotclock | 5 +++--
MAC/Tools/Rubidium/plotrubidium | 5 +++--
3 files changed, 6 insertions(+), 6 deletions(-)
mode change 100644 => 100755 MAC/Tools/Rubidium/plotrubidium
diff --git a/.gitattributes b/.gitattributes
index dc51187860c..9838c459817 100644
--- a/.gitattributes
+++ b/.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
diff --git a/MAC/Tools/Clock/plotclock b/MAC/Tools/Clock/plotclock
index d48ca778709..f9c64a4debd 100755
--- a/MAC/Tools/Clock/plotclock
+++ b/MAC/Tools/Clock/plotclock
@@ -1,6 +1,6 @@
#!/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
diff --git a/MAC/Tools/Rubidium/plotrubidium b/MAC/Tools/Rubidium/plotrubidium
old mode 100644
new mode 100755
index 7f7807b379b..aaf2532ae79
--- a/MAC/Tools/Rubidium/plotrubidium
+++ b/MAC/Tools/Rubidium/plotrubidium
@@ -1,6 +1,6 @@
#!/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
--
GitLab