From 65631e14c72db899924b6de31565e16711466ce3 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Thu, 23 Sep 2010 06:48:29 -0700 Subject: [PATCH] Revert Date Fix --- Shorewall/Perl/prog.header | 6 +++--- Shorewall/Perl/prog.header6 | 6 +++--- Shorewall/changelog.txt | 2 +- Shorewall/lib.cli | 2 +- Shorewall6/lib.cli | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Shorewall/Perl/prog.header b/Shorewall/Perl/prog.header index 786f6d4e1..3d85d6b32 100644 --- a/Shorewall/Perl/prog.header +++ b/Shorewall/Perl/prog.header @@ -43,7 +43,7 @@ progress_message() # $* = Message fi if [ $LOG_VERBOSITY -gt 1 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } @@ -59,7 +59,7 @@ progress_message2() # $* = Message fi if [ $LOG_VERBOSITY -gt 0 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } @@ -75,7 +75,7 @@ progress_message3() # $* = Message fi if [ $LOG_VERBOSITY -ge 0 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } diff --git a/Shorewall/Perl/prog.header6 b/Shorewall/Perl/prog.header6 index c8e3a43b8..979a6ad65 100644 --- a/Shorewall/Perl/prog.header6 +++ b/Shorewall/Perl/prog.header6 @@ -43,7 +43,7 @@ progress_message() # $* = Message fi if [ $LOG_VERBOSITY -gt 1 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } @@ -59,7 +59,7 @@ progress_message2() # $* = Message fi if [ $LOG_VERBOSITY -gt 0 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } @@ -75,7 +75,7 @@ progress_message3() # $* = Message fi if [ $LOG_VERBOSITY -ge 0 ]; then - timestamp="$(date +'%b %d %T') " + timestamp="$(date +'%b %_d %T') " echo "${timestamp}$@" >> $STARTUP_LOG fi } diff --git a/Shorewall/changelog.txt b/Shorewall/changelog.txt index 64aed61a0..e3c74d4f0 100644 --- a/Shorewall/changelog.txt +++ b/Shorewall/changelog.txt @@ -1,6 +1,6 @@ Changes in Shorewall 4.4.13.1 -1) Fix date formatting problem. +None. Changes in Shorewall 4.4.13 diff --git a/Shorewall/lib.cli b/Shorewall/lib.cli index 0b9be5df1..9cd898587 100644 --- a/Shorewall/lib.cli +++ b/Shorewall/lib.cli @@ -1321,7 +1321,7 @@ hits_command() { option= ;; t*) - today=$(date +'^%b %d.*') + today=$(date +'^%b %_d.*') option=${option#t} ;; *) diff --git a/Shorewall6/lib.cli b/Shorewall6/lib.cli index d48da38b6..bb92dd839 100644 --- a/Shorewall6/lib.cli +++ b/Shorewall6/lib.cli @@ -1028,7 +1028,7 @@ hits_command() { option= ;; t*) - today=$(date +'^%b %d.*') + today=$(date +'^%b %_d.*') option=${option#t} ;; *)