Uptime.tst: test for uptime >1 day on Mac OS X Server

<1 day results in error, <2 days results in warning.

diff --git a/client/lib/tests/Uptime.tst b/client/lib/tests/Uptime.tst
index ba40d5bb9dd0652d28b82a09e1b9dd6f4e48b3cd..9b05861722260d7d9b6de50d73bca5358ab3e232 100644 (file)
--- a/client/lib/tests/Uptime.tst
+++ b/client/lib/tests/Uptime.tst
@@ -9,14 +9,34 @@
 #
 
 SERVICE="Uptime_p"
 #
 
 SERVICE="Uptime_p"

+STATUS=0

 
 uptime=`LC_ALL=C uptime`
 uptime=${uptime%,*user*}
 uptime=${uptime##* up }
 
 os="`uname -s` `uname -r`"
 
 uptime=`LC_ALL=C uptime`
 uptime=${uptime%,*user*}
 uptime=${uptime##* up }
 
 os="`uname -s` `uname -r`"

-[ `uname` = "Darwin" ] \
-       && os="`sw_vers -productName` `sw_vers -productVersion`"

 
 

-STATUS=0
+if [ `uname` = "Darwin" ]; then
+       os="`sw_vers -productName` `sw_vers -productVersion`"
+       case "$os" in
+               *Server*)
+                       case "$uptime" in
+                               *" days, "*)
+                                       STATUS=0
+                                       ;;
+                               "1 day, "*)
+                                       STATUS=1
+                                       ;;
+                               *:*)
+                                       STATUS=2
+                                       ;;
+                               *)
+                                       STATUS=3
+                                       ;;
+                       esac
+                       ;;
+       esac
+fi
+

 TEXT="Uptime: $uptime - $os"
 TEXT="Uptime: $uptime - $os"