Merge branch 'issue-123'

Author: fvarrui

src/main/java/io/github/fvarrui/javapackager/model/LinuxConfig.java

@@ -15,6 +15,7 @@ public class LinuxConfig implements Serializable {
 	private boolean generateRpm = true;
 	private File pngFile;
 	private File xpmFile;
+	private boolean wrapJar = true;
 
 	public boolean isGenerateDeb() {
 		return generateDeb;
@@ -47,11 +48,19 @@ public File getXpmFile() {
 	public void setXpmFile(File xpmFile) {
 		this.xpmFile = xpmFile;
 	}
+	
+	public boolean isWrapJar() {
+		return wrapJar;
+	}
+	
+	public void setWrapJar(boolean wrapJar) {
+		this.wrapJar = wrapJar;
+	}
 
 	@Override
 	public String toString() {
 		return "LinuxConfig [generateDeb=" + generateDeb + ", generateRpm=" + generateRpm + ", pngFile=" + pngFile
-				+ ", xpmFile=" + xpmFile + "]";
+				+ ", xpmFile=" + xpmFile + ", wrapJar=" + wrapJar + "]";
 	}
 
 	/**

src/main/java/io/github/fvarrui/javapackager/packagers/LinuxPackager.java

@@ -65,7 +65,12 @@ public File doCreateApp() throws Exception {
 		Logger.info("Startup script generated in " + startupFile.getAbsolutePath());
 
 		// concats linux startup.sh script + generated jar in executable (binary)
-		FileUtils.concat(executable, startupFile, jarFile);
+		if (getLinuxConfig().isWrapJar())
+			FileUtils.concat(executable, startupFile, jarFile);
+		else {
+			FileUtils.copyFileToFile(startupFile, executable);
+			FileUtils.copyFileToFolder(jarFile, appFolder);
+		}
 
 		// sets execution permissions
 		executable.setExecutable(true, false);

src/main/resources/linux/startup.sh.vtl

@@ -53,7 +53,11 @@ fi
 #end
 #end
 
+#if ($info.linuxConfig.wrapJar)
 BINARY="$SCRIPTPATH/${info.executable.name}"
+#else
+BINARY="$SCRIPTPATH/${info.jarFile.name}"
+#end
 
 #if ($info.envPath)
 export PATH=${info.envPath}