X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Finventory.sh;h=4e88af11f526ff36ae551d1676c2845c2cc751f2;hb=4bd5169eb75c769397e1c86069f9d2356c89d63d;hp=b5cbacbd15dded495382e7f54a878f12414aa361;hpb=8ea609f418475a1490955eef28bb011cfb403d2e;p=feisty_meow.git diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh index b5cbacbd..4e88af11 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="up a whole $(cat /proc/uptime|awk '{print $1}') seconds, yo" fi # decide whether they've got splitter available or not.