From bdd90c3f5a7e53151cfda6143166380c3eaee1fa Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Tue, 7 Jul 2015 21:59:12 -0400 Subject: [PATCH] trying to make windows behave with cygwin when uptime is not installed. --- scripts/core/inventory.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh index b5cbacbd..f3d5dddd 100644 --- a/scripts/core/inventory.sh +++ b/scripts/core/inventory.sh @@ -20,12 +20,19 @@ if [ -z "$codename" ]; then osver="0.0?" fi -# test if this uptime knows the -p flag. -uptime -p &>/dev/null +# see if uptime even exists. +uptime &>/dev/null if [ $? -eq 0 ]; then - up="$(uptime -p)" + # test if this uptime knows the -p flag. + uptime -p &>/dev/null + if [ $? -eq 0 ]; then + up="$(uptime -p)" + else + up="$(uptime | awk '{print $2 " " $3 " " $4 " plus " $1 " hours" }')" + fi else - up="$(uptime | awk '{print $2 " " $3 " " $4 " plus " $1 " hours" }')" + # if we can't do this, then we're not even on windows cygwin. wth are we? + up="$(cat /proc/uptime|awk '{print $1}') seconds, yo" fi # decide whether they've got splitter available or not. -- 2.34.1