From 2fe09d2f0b42466967cd6268f1566e69f0332f22 Mon Sep 17 00:00:00 2001 From: mikedowney01 Date: Fri, 12 Dec 2014 13:07:22 -0500 Subject: [PATCH 1/2] Updated with support for OS X Yosemite (10.10) --- check_time_machine_currency.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/check_time_machine_currency.sh b/check_time_machine_currency.sh index 8123de0..f230b35 100755 --- a/check_time_machine_currency.sh +++ b/check_time_machine_currency.sh @@ -53,11 +53,12 @@ then exit 3 fi -# Check to see if we're running Mavericks as Time Machine runs a little differently -osVersion=`sw_vers -productVersion | grep -E -o "[0-9]+\.[0-9]"` +# Check to see if we're running Mavericks or Yosemite as Time Machine runs a little differently +osVersion=`sw_vers -productVersion | grep -E -o "[0-9]?[0-9]+\.[0-9]?[0-9]"` isMavericks=`echo $osVersion '< 10.9' | bc -l` +isYosemite=`echo $osVersion '< 10.10' | bc -l` -if [ $isMavericks -eq 0 ] +if [ $isMavericks -eq 0 ] || [ $isYosemite -eq 0 ] then # 10.9+ Check lastBackupDateString=`tmutil latestbackup | grep -E -o "[0-9]{4}-[0-9]{2}-[0-9]{2}-[0-9]{6}"` @@ -105,4 +106,4 @@ then else printf "CRITICAL - Could not determine the last backup date for this Mac.\n" exit 2 -fi \ No newline at end of file +fi From 482decdd241ff18662ee8e1a09788f530fa717fc Mon Sep 17 00:00:00 2001 From: mikedowney01 Date: Fri, 12 Dec 2014 15:03:03 -0500 Subject: [PATCH 2/2] Removed unneeded portion of regex --- check_time_machine_currency.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_time_machine_currency.sh b/check_time_machine_currency.sh index f230b35..3e91fd4 100755 --- a/check_time_machine_currency.sh +++ b/check_time_machine_currency.sh @@ -54,7 +54,7 @@ then fi # Check to see if we're running Mavericks or Yosemite as Time Machine runs a little differently -osVersion=`sw_vers -productVersion | grep -E -o "[0-9]?[0-9]+\.[0-9]?[0-9]"` +osVersion=`sw_vers -productVersion | grep -E -o "[0-9]+\.[0-9]?[0-9]"` isMavericks=`echo $osVersion '< 10.9' | bc -l` isYosemite=`echo $osVersion '< 10.10' | bc -l`