X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Finventory.sh;h=d32c86c7933c019b2be138060d2125bacc77c457;hb=e6ce0aa508c3ad1beb167fdf20732b24f383c651;hp=00a8213fd1fe24a5847f122dd8980216552ddc76;hpb=7f1c937cb19586434fd9cda6c7330d062d58bdde;p=feisty_meow.git

diff --git a/scripts/core/inventory.sh b/scripts/core/inventory.sh
index 00a8213f..d32c86c7 100644
--- a/scripts/core/inventory.sh
+++ b/scripts/core/inventory.sh
@@ -3,15 +3,37 @@
 # 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
-  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)"
+  if [ -z "$IS_DARWIN" ]; then
+    # we only try running lsb_release if not on a mac.
+    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
+  else
+    # darwin / mac doesn't have lsb since not linux.
+#Usage: sw_vers [-productName|-productVersion|-buildVersion]
+    osname="$(sw_vers -productName 2>/dev/null)"
+    osver="$(sw_vers -productVersion 2>/dev/null)"
+#echo "osname = '$osname' and osver = '$osver'"
+    if [[ "$osver" =~ ^10\.15.*$ ]]; then
+      codename="Catalina"
+    elif [[ "$osver" =~ ^10\.14.*$ ]]; then
+      codename="Mojave"
+    elif [[ "$osver" =~ ^10\.13.*$ ]]; then
+      codename="High Sierra"
+    elif [[ "$osver" =~ ^11\..*$ ]]; then
+      codename="Big Sur"
+    elif [[ "$osver" =~ ^12\..*$ ]]; then
+      codename="Monterey"
+    else
+      codename="$(sw_vers -buildVersion 2>/dev/null)"
+    fi
   fi
 fi
 if [ -z "$codename" ]; then
@@ -36,27 +58,21 @@ else
 fi
 
 # decide whether they've got splitter available or not.
-if [ -f "$BINDIR/splitter" -o -f "$BINDIR/splitter.exe" ]; then
+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="$BINDIR/splitter --maxcol $(($cols - 1))"
+  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