projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c78746e
)
fix to get the codename for macos right
author
Chris Koeritz
<cak0l@virginia.edu>
Thu, 11 Nov 2021 16:20:30 +0000
(11:20 -0500)
committer
Chris Koeritz
<cak0l@virginia.edu>
Thu, 11 Nov 2021 16:20:30 +0000
(11:20 -0500)
scripts/core/inventory.sh
patch
|
blob
|
history
diff --git
a/scripts/core/inventory.sh
b/scripts/core/inventory.sh
index aa5b049484f48ea7954c8d8ee917cc62faba3655..d32c86c7933c019b2be138060d2125bacc77c457 100644
(file)
--- a/
scripts/core/inventory.sh
+++ b/
scripts/core/inventory.sh
@@
-20,15
+20,16
@@
if [ $OPERATING_SYSTEM == "UNIX" ]; then
#Usage: sw_vers [-productName|-productVersion|-buildVersion]
osname="$(sw_vers -productName 2>/dev/null)"
osver="$(sw_vers -productVersion 2>/dev/null)"
#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"
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
+ elif [[ "$osver" =~ ^11\.
.
*$ ]]; then
codename="Big Sur"
codename="Big Sur"
- elif [[ "$osver" =~ ^12\.*$ ]]; then
+ elif [[ "$osver" =~ ^12\.
.
*$ ]]; then
codename="Monterey"
else
codename="$(sw_vers -buildVersion 2>/dev/null)"
codename="Monterey"
else
codename="$(sw_vers -buildVersion 2>/dev/null)"