[FIXED JENKINS-26982] MacOSX: re-use jenkins user default group for g…

…roup own�$B!D�(Bership permissions Porting lacostej/jenkins@66cb50d
jenkinsci · Apr 29, 2015 · 26b1323 · 26b1323 · daniel-beck · Apr 29, 2015
1 parent 1f9ef5c
commit 26b1323
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/osx/scripts/postinstall-launchd-jenkins b/osx/scripts/postinstall-launchd-jenkins
@@ -44,7 +44,13 @@ else
     dscl . -append /Groups/@@ARTIFACTNAME@@ GroupMembership @@ARTIFACTNAME@@
 fi
 
-find "$JENKINS_HOMEDIR" \( -not -user @@ARTIFACTNAME@@ -or -not -group @@ARTIFACTNAME@@ \) -print0 | xargs -0 chown @@ARTIFACTNAME@@:@@ARTIFACTNAME@@
+# identify the real default group name for user jenkins
+groupid=`dscl . read /Users/@@ARTIFACTNAME@@ PrimaryGroupID | awk '{print $2}'`
+gname=`id -n -g $groupid`
+
+echo "Using @@ARTIFACTNAME@@:${gname} as file owner and group for @@ARTIFACTNAME@@ daemon files"
+
+find "$JENKINS_HOMEDIR" \( -not -user @@ARTIFACTNAME@@ -or -not -group ${gname} \) -print0 | xargs -0 chown @@ARTIFACTNAME@@:${gname}
 
 # Add defaults for heap sizing
 arch=$(uname -m)
@@ -67,17 +73,17 @@ defaults write $DEFAULTS_PLIST httpPort @@PORT@@
 JENKINS_TMPDIR="$JENKINS_HOMEDIR/tmp"
 defaults write $DEFAULTS_PLIST tmpdir $JENKINS_TMPDIR
 mkdir -p $JENKINS_TMPDIR
-chown @@ARTIFACTNAME@@:@@ARTIFACTNAME@@ $JENKINS_TMPDIR
+chown @@ARTIFACTNAME@@:${gname} $JENKINS_TMPDIR
 
 # Create log directory, which can be written by Jenkins daemon
 mkdir -p /var/log/@@ARTIFACTNAME@@
-chown @@ARTIFACTNAME@@:@@ARTIFACTNAME@@ /var/log/@@ARTIFACTNAME@@
+chown @@ARTIFACTNAME@@:${gname} /var/log/@@ARTIFACTNAME@@
 
 # Enable log rotation by newsyslog
 cat <<_EOT_ > /etc/newsyslog.d/@@ARTIFACTNAME@@.conf
 # logfilename          [owner:group]    mode count size when  flags [/pid_file] [sig_num]
 # Rotate @@PRODUCTNAME@@ log at midnight, and preserve old logs in 3 days
-/var/log/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.log   @@ARTIFACTNAME@@:@@ARTIFACTNAME@@         644  3     *    \$D0   J
+/var/log/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.log   @@ARTIFACTNAME@@:${gname}         644  3     *    \$D0   J
 _EOT_
 
 # Load and start the launch daemon