Merge branch 'release-2.140.101'

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

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index f3d5dddd83b561e55d9155eac48fd902b5876c1b..db33f74cf5b0afddab17b93f6fd0e5b96f3ebaa6 100644 (file)
--- 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
@@ -32,29 +32,25 @@ if [ $? -eq 0 ]; then
   fi
 else
   # 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"
+  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=$(get_maxcols)
+  splitter="$FEISTY_MEOW_BINARIES/splitter --maxcol $(($cols - 1))"
 else
   # not available, so just emit as huge overly long string.
   splitter="cat"
 fi
 echo
 echo "it is $(date +"%A at %H:%M hours on day %e of the %B moon in the gregorian year %Y" | tr A-Z a-z) and our intrepid adventurer $USER is exploring a computer named $(hostname) that is running in a thoughtspace called $osname $osver (code-name $codename), and $USER has deduced that the machine's OS platform is $(uname -m) and its current incarnation has been ${up}." | $splitter 
-#hmmm: splitter not accepting these args properly right now:
-#--mincol 2 --maxcol 40
 echo
-#echo '++++++++++++++++++++++++++++++++++++++++++'
-#echo
 echo "the following things appear to be lying around here..."
 echo
 ls -hFC $color_add
 echo
-#echo '++++++++++++++++++++++++++++++++++++++++++'
-#echo
 echo "there appear to be these entities on this host..."
 echo
 who -suT