From 11875648351b0de6b61eaa1b18f36b426b837abd Mon Sep 17 00:00:00 2001
From: Chris Rankin <rankincj@googlemail.com>
Date: Sat, 11 Feb 2017 22:27:55 +0000
Subject: [PATCH] Tidy up gradle usage.

---
 tools/demobench/build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/demobench/build.gradle b/tools/demobench/build.gradle
index cbf829227b..cf95553d2c 100644
--- a/tools/demobench/build.gradle
+++ b/tools/demobench/build.gradle
@@ -9,8 +9,7 @@ buildscript {
 
     ext.java_home = System.properties.'java.home'
     ext.pkg_source = "$buildDir/packagesrc"
-    ext.dist_name = "demobench-$version"
-    ext.dist_source = "$pkg_source/$dist_name"
+    ext.dist_source = "$pkg_source/demobench-$version"
     ext.pkg_version = "$version".indexOf('-') >= 0 ? "$version".substring(0, "$version".indexOf('-')) : "$version"
 
     repositories {
@@ -129,7 +128,7 @@ task javapackage(dependsOn: 'distZip') {
         delete(["$pkg_source", "$buildDir/exedir"])
 
         copy {
-            from(zipTree("$buildDir/distributions/${dist_name}.zip"))
+            from(zipTree(distZip.outputs.files.singleFile))
             into "$pkg_source"
         }