From 45984f8e26ae5c3ee939fdd1809f211b3df13274 Mon Sep 17 00:00:00 2001 From: pahimar Date: Wed, 4 Jun 2014 21:38:50 -0400 Subject: [PATCH] Better protection for the build task if a user doesn't have the project parameters defined --- build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index c2d26a1f..8a4a310e 100644 --- a/build.gradle +++ b/build.gradle @@ -67,15 +67,15 @@ import net.minecraftforge.gradle.tasks.dev.ChangelogTask task createChangelog(type: ChangelogTask) { - def jobName = "${System.getenv().JOB_NAME}" + def jobName = "${System.getenv().JOB_NAME} ?: ''" def buildNumber = "${System.getenv().BUILD_NUMBER}" - setServerRoot(new DelayedString(project, project.jenkins_server)) + setServerRoot(new DelayedString(project, "project.jenkins_server ?: ''")) setJobName(new DelayedString(project, jobName.toString())) - setAuthName(new DelayedString(project, project.jenkins_user)) - setAuthPassword(new DelayedString(project, project.jenkins_password)) + setAuthName(new DelayedString(project, "project.jenkins_user ?: ''")) + setAuthPassword(new DelayedString(project, "project.jenkins_password ?: ''")) setTargetBuild({ buildNumber.toString() }); - setOutput(new DelayedFile(project, 'build/libs/' + project.getName() + '-' + project.version + '-changelog.txt')); + setOutput(new DelayedFile(project, 'build/libs/' + jobName.toString() + '-' + project.version + '-changelog.txt')); onlyIf { return (("${System.getenv().JOB_NAME}" != null) && project.hasProperty("jenkins_server") && project.hasProperty("jenkins_password"))