From 9c9691c5d6b2541cd860a4c64f2c16bac5078f2c Mon Sep 17 00:00:00 2001 From: "tlimoncelli@stackexchange.com" Date: Sat, 28 Feb 2015 08:18:26 -0600 Subject: [PATCH] BUG: "make confidence" should work on Mac OS X --- tools/confidence_test.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/confidence_test.sh b/tools/confidence_test.sh index 216f49a..e4e5577 100755 --- a/tools/confidence_test.sh +++ b/tools/confidence_test.sh @@ -236,13 +236,14 @@ PHASE 'Bob makes sure he has all new keys.' gpg --import keyrings/live/pubring.gpg # Pick a GID to use: +# This users's default group: +DEFAULT_GID_NAME=$(id -gn) +# Pick a group that is not the default group: TEST_GID_NUM=$(id -G | fmt -1 | tail -n +2 | grep -xv $(id -u) | head -n 1) -TEST_GID_NAME=$(getent group "$TEST_GID_NUM" | cut -d: -f1) -DEFAULT_GID_NAME=$(getent group $(id -u) | cut -d: -f1) -: ${DEFAULT_GID_NAME:=staff) ; +TEST_GID_NAME=$(python -c 'import grp; print grp.getgrgid('"$TEST_GID_NUM"').gr_name') +echo DEFAULT_GID_NAME=$DEFAULT_GID_NAME echo TEST_GID_NUM=$TEST_GID_NUM echo TEST_GID_NAME=$TEST_GID_NAME -echo DEFAULT_GID_NAME=$DEFAULT_GID_NAME PHASE 'Bob postdeploys... default.' blackbox_postdeploy