X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Finventory.sh;h=e2290d5afccd8102d67c6530bcf1bfd7b677b2b5;hb=668c41b51990bc1b1a862ed09a33ac6f9cd16084;hp=b5cbacbd15dded495382e7f54a878f12414aa361;hpb=8c5cfa3cc29ea1ad1d27c3d8db8b32b38cf37d51;p=feisty_meow.git

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index b5cbacbd..e2290d5a 100644
--- a/scripts/core/inventory.sh
+++ b/scripts/core/inventory.sh
@@ -3,7 +3,7 @@
 # a frivolous but useful script that shows information about the local
 # computer in terms of an adventure game inventory listing.
 
-source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
+source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 
 unset -v codename osname osver
 if [ $OPERATING_SYSTEM == "UNIX" ]; then
@@ -20,17 +20,26 @@ 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"
+if [ -f "$FEISTY_MEOW_BINARIES/splitter" -o -f "$FEISTY_MEOW_BINARIES/splitter.exe" ]; then
+  # calculate the number of columsn in the terminal.
+  cols=$(stty size | awk '{print $2}')
+  splitter="$FEISTY_MEOW_BINARIES/splitter --maxcol $(($cols - 1))"
 else
   # not available, so just emit as huge overly long string.
   splitter="cat"