X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Finventory.sh;h=b5cbacbd15dded495382e7f54a878f12414aa361;hb=ab6bacb578744ce2a0132af78fbf5dc461cf00d3;hp=744fb0aef9009911ea542928965509794de24659;hpb=4d7f9a2b66436582743d72baf3071825b910dd23;p=feisty_meow.git

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index 744fb0ae..b5cbacbd 100644
--- a/scripts/core/inventory.sh
+++ b/scripts/core/inventory.sh
@@ -5,37 +5,51 @@
 
 source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
-echo
-echo '++++++++++++++++++++++++++++++++++++++++++'
-
-unset codename
+unset -v codename osname osver
 if [ $OPERATING_SYSTEM == "UNIX" ]; then
   which lsb_release &>/dev/null
   if [ $? -eq 0 ]; then
     codename="$(lsb_release -cs 2>/dev/null)"
+    osname="$(lsb_release -is 2>/dev/null)"
+    osver="$(lsb_release -rs 2>/dev/null)"
   fi
 fi
 if [ -z "$codename" ]; then
   codename="mysterioso"
+  osname="unspecified"
+  osver="0.0?"
+fi
+
+# 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
 
+# decide whether they've got splitter available or not.
+if [ -f "$BINDIR/splitter" -o -f "$BINDIR/splitter.exe" ]; then
+  splitter="$BINDIR/splitter"
+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) (code-name $codename) and has found that the machine's OS platform is $(uname -m) and its current incarnation has been $(uptime -p)." | splitter 
+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 '++++++++++++++++++++++++++++++++++++++++++'
+#echo
 echo "the following things appear to be lying around here..."
 echo
 ls -hFC $color_add
 echo
-echo '++++++++++++++++++++++++++++++++++++++++++'
-echo
+#echo '++++++++++++++++++++++++++++++++++++++++++'
+#echo
 echo "there appear to be these entities on this host..."
 echo
 who -suT
 echo
-echo '++++++++++++++++++++++++++++++++++++++++++'
-echo