fixing column flags for splitter. also need to fix some persistent issues with end...

[feisty_meow.git] / scripts / core / inventory.sh

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index b5cbacbd15dded495382e7f54a878f12414aa361..d4a00e5c0ed7999e1bcb9f738a307979dee15c6f 100644 (file)
--- a/scripts/core/inventory.sh
+++ b/scripts/core/inventory.sh
@@ -20,17 +20,24 @@ 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.
 if [ -f "$BINDIR/splitter" -o -f "$BINDIR/splitter.exe" ]; then
-  splitter="$BINDIR/splitter"
+  splitter="$BINDIR/splitter --maxcol $(($COLUMNS - 1))"
 else
   # not available, so just emit as huge overly long string.
   splitter="cat"