projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cc43301
)
trying to make windows behave with cygwin when uptime is not installed.
author
Chris Koeritz
<fred@gruntose.com>
Wed, 8 Jul 2015 01:59:12 +0000
(21:59 -0400)
committer
Chris Koeritz
<fred@gruntose.com>
Wed, 8 Jul 2015 01:59:12 +0000
(21:59 -0400)
scripts/core/inventory.sh
patch
|
blob
|
history
diff --git
a/scripts/core/inventory.sh
b/scripts/core/inventory.sh
index b5cbacbd15dded495382e7f54a878f12414aa361..f3d5dddd83b561e55d9155eac48fd902b5876c1b 100644
(file)
--- a/
scripts/core/inventory.sh
+++ b/
scripts/core/inventory.sh
@@
-20,12
+20,19
@@
if [ -z "$codename" ]; then
osver="0.0?"
fi
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
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
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.
fi
# decide whether they've got splitter available or not.