From 347799254c3cfb489a9ee0e6eedc3a6edc9e81e1 Mon Sep 17 00:00:00 2001 From: emmanue1 Date: Mon, 22 Jun 2015 20:41:11 +0200 Subject: [PATCH] Fixes after merge pull request --- README.md | 2 +- build.gradle | 53 +++++++++++++++++++++------------------------------- 2 files changed, 22 insertions(+), 33 deletions(-) diff --git a/README.md b/README.md index 9fe6c93..4d1dba9 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ generate _"build/install/jd-gui-windows/jd-gui.exe"_ ``` > gradle buildDeb ``` -generate Ubuntu/Debian Installer +generate Ubuntu/Debian installer ##How to launch JD-GUI ? - Double-click on _"jd-gui-x.y.z.jar"_ diff --git a/build.gradle b/build.gradle index 7973990..9a4043b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,17 @@ - buildscript { - repositories { - jcenter() - } - - dependencies { - classpath 'com.netflix.nebula:gradle-ospackage-plugin:2.2.6' - classpath 'org.spockframework:spock-core:1.0-groovy-2.3' - - } +buildscript { + repositories { + jcenter() } - + + dependencies { + classpath 'com.netflix.nebula:gradle-ospackage-plugin:2.2.6' + classpath 'org.spockframework:spock-core:1.0-groovy-2.3' + } +} + apply plugin: 'java' apply plugin: 'distribution' -apply plugin: "nebula.os-package" - - - +apply plugin: 'nebula.os-package' // Common configuration // allprojects { @@ -44,10 +40,8 @@ allprojects { provided compile.extendsFrom provided } - } - // 'cleanIdea' task extension // cleanIdea { file(project.name + '.iws').delete() @@ -163,30 +157,25 @@ distributions { ospackage { packageName = project.name - description = 'A Java Decompoler ' - version = '0.0.1' - release = 1 + description = 'A Java Decompiler' os = LINUX url = 'https://github.com/java-decompiler/jd-gui' license = file('LICENSE') - into '/opt/'+ project.name - from ('build/libs/'){ - fileMode = 0755 + into '/opt/' + project.name + from ('build/libs/') { + fileMode = 0755 } - from ('src/linux/resources/'){ - fileMode = 0755 + from ('src/linux/resources/') { + fileMode = 0755 } - from ('app/src/main/resources/images/jd_icon_128.png'){ - fileMode = 0755 + from ('app/src/main/resources/images/jd_icon_128.png') { + fileMode = 0755 } from 'LICENSE', 'NOTICE', 'README.md' - - - + postInstall 'cd /opt/'+ project.name+'; ln -s ./jd-gui-'+project.version+'.jar ./jd-gui.jar; xdg-icon-resource install --size 128 --novendor ./jd_icon_128.png jd-gui ; xdg-desktop-menu install ./*.desktop' - preUninstall 'cd /opt/'+ project.name+'; rm -f ./jd-gui.jar; xdg-desktop-menu uninstall ./*.desktop' - + preUninstall 'cd /opt/'+ project.name+'; rm -f ./jd-gui.jar; xdg-desktop-menu uninstall ./*.desktop' } installOsxDist.dependsOn jar, copyAndReplaceVariablesInInfoPlist