Skip to content

Commit 7c51cec

Browse files
committed
Merge pull request jenkinsci#1061 from OnBeep/feature/ampledata-mac_os_x_tmp
[JENKINS-17526] Relocating Jetty/Java tmpdir for Mac OS X.
2 parents 5727f28 + 95842fd commit 7c51cec

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

osx/Library/Application Support/Jenkins/jenkins-runner.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ permGen=`$defaults permGen` && javaArgs="$javaArgs -XX:MaxPermSize=${permGen}"
2222
minHeapSize=`$defaults minHeapSize` && javaArgs="$javaArgs -Xms${minHeapSize}"
2323
heapSize=`$defaults heapSize` && javaArgs="$javaArgs -Xmx${heapSize}"
2424

25+
tmpdir=`$defaults tmpdir` && javaArgs="$javaArgs -Djava.io.tmpdir=${tmpdir}"
26+
2527
home=`$defaults JENKINS_HOME` && export JENKINS_HOME="$home"
2628

2729
add_to_args() {

osx/scripts/postinstall-launchd-jenkins

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ else
6161
defaults write $DEFAULTS_PLIST minPermGen 64m
6262
fi
6363

64+
# Set tmpdir
65+
JENKINS_TMPDIR="$JENKINS_HOMEDIR/tmp"
66+
defaults write $DEFAULTS_PLIST tmpdir $JENKINS_TMPDIR
67+
mkdir -p $JENKINS_TMPDIR
68+
chown jenkins:jenkins $JENKINS_TMPDIR
69+
6470
# Create log directory, which can be written by Jenkins daemon
6571
mkdir -p /var/log/jenkins
6672
chown jenkins:jenkins /var/log/jenkins

0 commit comments

Comments
 (0)