Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #1061 from OnBeep/feature/ampledata-mac_os_x_tmp
[JENKINS-17526] Relocating Jetty/Java tmpdir for Mac OS X.
Originally-From: jenkins-ci.org/commit/core/7c51cec55649b0e46047cb5e3198b66c3bdd94d5
  • Loading branch information
olamy committed Jan 16, 2014
2 parents f748eeb + c8fb9d7 commit c932cd9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Library/Application Support/Jenkins/jenkins-runner.sh
Expand Up @@ -22,6 +22,8 @@ permGen=`$defaults permGen` && javaArgs="$javaArgs -XX:MaxPermSize=${permGen}"
minHeapSize=`$defaults minHeapSize` && javaArgs="$javaArgs -Xms${minHeapSize}"
heapSize=`$defaults heapSize` && javaArgs="$javaArgs -Xmx${heapSize}"

tmpdir=`$defaults tmpdir` && javaArgs="$javaArgs -Djava.io.tmpdir=${tmpdir}"

home=`$defaults JENKINS_HOME` && export JENKINS_HOME="$home"

add_to_args() {
Expand Down
6 changes: 6 additions & 0 deletions scripts/postinstall-launchd-jenkins
Expand Up @@ -61,6 +61,12 @@ else
defaults write $DEFAULTS_PLIST minPermGen 64m
fi

# Set tmpdir
JENKINS_TMPDIR="$JENKINS_HOMEDIR/tmp"
defaults write $DEFAULTS_PLIST tmpdir $JENKINS_TMPDIR
mkdir -p $JENKINS_TMPDIR
chown jenkins:jenkins $JENKINS_TMPDIR

# Create log directory, which can be written by Jenkins daemon
mkdir -p /var/log/jenkins
chown jenkins:jenkins /var/log/jenkins
Expand Down

0 comments on commit c932cd9

Please sign in to comment.