projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added 'squished on' phrase to file names.
[feisty_meow.git]
/
scripts
/
core
/
inventory.sh
diff --git
a/scripts/core/inventory.sh
b/scripts/core/inventory.sh
index b5cbacbd15dded495382e7f54a878f12414aa361..00a8213fd1fe24a5847f122dd8980216552ddc76 100644
(file)
--- a/
scripts/core/inventory.sh
+++ b/
scripts/core/inventory.sh
@@
-20,17
+20,26
@@
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="up a whole $(cat /proc/uptime|awk '{print $1}') seconds, yo"
fi
# decide whether they've got splitter available or not.
if [ -f "$BINDIR/splitter" -o -f "$BINDIR/splitter.exe" ]; then
fi
# decide whether they've got splitter available or not.
if [ -f "$BINDIR/splitter" -o -f "$BINDIR/splitter.exe" ]; then
- splitter="$BINDIR/splitter"
+ # calculate the number of columsn in the terminal.
+ cols=$(stty size | awk '{print $2}')
+ splitter="$BINDIR/splitter --maxcol $(($cols - 1))"
else
# not available, so just emit as huge overly long string.
splitter="cat"
else
# not available, so just emit as huge overly long string.
splitter="cat"