Merge pull request #75 from bavardage/patch-1

var/tmp/files -> var/data/tmp
palantir · May 24, 2016 · 6779829 · 6779829
2 parents 1a4df6e + 401f9dc
commit 6779829
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy b/src/main/groovy/com/palantir/gradle/javadist/DistTarTask.groovy
@@ -57,7 +57,7 @@ class DistTarTask extends Tar {
             }
         }
 
-        new File(project.projectDir, "var/tmp/files").mkdirs()
+        new File(project.projectDir, "var/data/tmp").mkdirs()
 
         from("${project.projectDir}/deployment") {
             into "${archiveRootDir}/deployment"

diff --git a/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy b/src/main/groovy/com/palantir/gradle/javadist/DistributionExtension.groovy
@@ -19,7 +19,7 @@ class DistributionExtension {
 
     private static final List<String> requiredJvmOpts = [
         '-Djava.security.egd=file:/dev/./urandom',
-        '-Djava.io.tmpdir=var/tmp/files'
+        '-Djava.io.tmpdir=var/data/tmp'
     ]
 
     private String serviceName

diff --git a/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy b/src/test/groovy/com/palantir/gradle/javadist/JavaDistributionPluginTests.groovy
@@ -101,7 +101,7 @@ class JavaDistributionPluginTests extends Specification {
         new File(projectDir, 'dist/service-name-0.1/var/conf/service-name.yml').exists()
     }
 
-    def 'produce distribution bundle and check var/tmp/files is created' () {
+    def 'produce distribution bundle and check var/data/tmp is created' () {
         given:
         createUntarBuildFile(buildFile)
 
@@ -114,7 +114,7 @@ class JavaDistributionPluginTests extends Specification {
         buildResult.task(':untar').outcome == TaskOutcome.SUCCESS
 
         // check content was extracted
-        new File(projectDir, 'dist/service-name-0.1/var/tmp/files').exists()
+        new File(projectDir, 'dist/service-name-0.1/var/data/tmp').exists()
     }
 
     def 'produce distribution bundle with custom exclude set' () {
@@ -268,7 +268,7 @@ class JavaDistributionPluginTests extends Specification {
         // check start script uses default JVM options
         new File(projectDir, 'dist/service-name-0.1/service/bin/service-name').exists()
         String startScript = readFully('dist/service-name-0.1/service/bin/service-name')
-        startScript.contains('DEFAULT_JVM_OPTS=\'"-Djava.security.egd=file:/dev/./urandom" "-Djava.io.tmpdir=var/tmp/files" "-Xmx4M" "-Djavax.net.ssl.trustStore=truststore.jks"\'')
+        startScript.contains('DEFAULT_JVM_OPTS=\'"-Djava.security.egd=file:/dev/./urandom" "-Djava.io.tmpdir=var/data/tmp" "-Xmx4M" "-Djavax.net.ssl.trustStore=truststore.jks"\'')
     }
 
     def 'produce distribution bundle that populates config.sh' () {