mirror of
https://github.com/sudo-project/sudo.git
synced 2025-08-29 13:28:10 +00:00
Fix probe for macOS Big Sur
"sw_vers -productName" now returns "macOS", not "Mac OS X"
This commit is contained in:
parent
a940a2c78e
commit
d12f7ccf25
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright 2020 One Identity LLC. ALL RIGHTS RESERVED
|
# Copyright 2020 One Identity LLC. ALL RIGHTS RESERVED
|
||||||
pp_revision="20200624"
|
pp_revision="20200813"
|
||||||
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
|
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
@ -7486,7 +7486,7 @@ pp_backend_macos_flat () {
|
|||||||
test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
|
test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
|
||||||
|
|
||||||
# Create the flat package with xar (like pkgutil --flatten does)
|
# Create the flat package with xar (like pkgutil --flatten does)
|
||||||
# Note that --distribution is only supported by Mac OS X 10.6 and above
|
# Note that --distribution is only supported by macOS 10.6 and above
|
||||||
xar_flags="--compression=bzip2 --no-compress Scripts --no-compress Payload"
|
xar_flags="--compression=bzip2 --no-compress Scripts --no-compress Payload"
|
||||||
case $mac_version in
|
case $mac_version in
|
||||||
"10.5"*) ;;
|
"10.5"*) ;;
|
||||||
@ -7682,6 +7682,7 @@ pp_macos_add_service () {
|
|||||||
pp_backend_macos_probe () {
|
pp_backend_macos_probe () {
|
||||||
typeset name vers arch
|
typeset name vers arch
|
||||||
case `sw_vers -productName` in
|
case `sw_vers -productName` in
|
||||||
|
"macOS") name="macos";;
|
||||||
"Mac OS X") name="macos";;
|
"Mac OS X") name="macos";;
|
||||||
*) name="unknown";;
|
*) name="unknown";;
|
||||||
esac
|
esac
|
||||||
|
Loading…
x
Reference in New Issue
Block a user