Skip to content

Commit 6226733

Browse files
committed
Detect Mac OS X 10.6+, where the original problem was never exhibited (see the console output from Installer when perform an unprivileged installation).
1 parent 8b30906 commit 6226733

File tree

2 files changed

+18
-0
lines changed

2 files changed

+18
-0
lines changed

Installer/distribution-mpkg/resources/admin_privs_needed.command

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ SCRIPT_WD=`pwd`
44
DIR=/Library/Receipts/clicktoflash-nonadmin.pkg/
55
GROUPS=`id -Gn $USER`
66

7+
case `uname -r` in
8+
[89].*)
9+
true
10+
;;
11+
*)
12+
echo "Running on Snow Leopard or newer, no need to care."
13+
exit 0
14+
esac
15+
716
if [ -d $DIR ]; then
817
echo "There is a receipt, no admin privs required for installer pkg."
918
exit 0

Installer/distribution-mpkg/resources/no_admin_privs_needed.command

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ SCRIPT_WD=`pwd`
44
DIR=/Library/Receipts/clicktoflash-nonadmin.pkg/
55
GROUPS=`id -Gn $USER`
66

7+
case `uname -r` in
8+
[89].*)
9+
true
10+
;;
11+
*)
12+
echo "Running on Snow Leopard or newer, no need to care."
13+
exit 1
14+
esac
15+
716
if [ -d $DIR ]; then
817
echo "There is a receipt, no admin privs required for installer pkg."
918
exit 1

0 commit comments

Comments
 (0)