From 19907a2c28fd6394ee6d7537dc2c2ba6f15124d9 Mon Sep 17 00:00:00 2001 From: ylexus Date: Wed, 11 Aug 2021 23:38:02 +0100 Subject: [PATCH] #119 fix configuration error in renameDistribution --- app/build.gradle | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 084d6b5..150d0e4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -273,21 +273,24 @@ task runOsSpecificPackaging(type: Exec) { task renameDistribution() { onlyIf { !OperatingSystem.current().windows } - doLast { - if (OperatingSystem.current().macOsX) { + if (OperatingSystem.current().macOsX) { + doLast { ant.move file: "$buildDir/jpackage/$applicationName-${version}.dmg", tofile: "$fullPackageOutputDir/macOS-jiotty-photos-uploader-${version}.dmg" - inputs.files "$buildDir/jpackage/$applicationName-${version}.dmg" - outputs.files "$fullPackageOutputDir/macOS-jiotty-photos-uploader-${version}.dmg" } - if (OperatingSystem.current().linux) { + inputs.files "$buildDir/jpackage/$applicationName-${version}.dmg" + outputs.files "$fullPackageOutputDir/macOS-jiotty-photos-uploader-${version}.dmg" + } + + if (OperatingSystem.current().linux) { + doLast { ant.move(todir: fullPackageOutputDir) { fileset dir: "$buildDir/jpackage", includes: '*.deb,*.rpm' mapper type: "glob", from: "*", to: "Linux-*" } - inputs.dir "$buildDir/jpackage" - outputs.dir fullPackageOutputDir } + inputs.dir "$buildDir/jpackage" + outputs.dir fullPackageOutputDir } }