U appimage generation fixes

Author: fvarrui

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

@@ -44,6 +44,7 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		String name = packager.getName();
 		File executable = packager.getExecutable();
 		File assetsFolder = packager.getAssetsFolder();
+		File iconFile = packager.getIconFile();
 
 		// output AppImage file
 		File appImage = new File(outputFolder, name + ".AppImage");
@@ -56,18 +57,23 @@ protected File doApply(LinuxPackager packager) throws Exception {
 		File appImageTool = getAppImageTool(packager);
 		Logger.info("App image tool found! " + appImageTool);
 
-		// copies app folder to assets
-		FileUtils.copyFolderContentToFolder(appFolder, appDir);
+		// copies app folder to AppDir/usr/bin
+		FileUtils.copyFolderContentToFolder(appFolder, new File(appDir, "usr/bin"));
 
-		// generates desktop file from velocity template
+		// generates AppImage desktop file from velocity template
 		File desktopFile = new File(appDir, name + ".desktop");
-		VelocityUtils.render("linux/desktop.vtl", desktopFile, packager);
+		VelocityUtils.render("linux/desktop-appimage.vtl", desktopFile, packager);
 		Logger.info("Desktop file rendered in " + desktopFile.getAbsolutePath());
 
 		// creates AppRun symlink to startup script
 		Logger.info("Creating AppRun symlink to startup script...");
-		File appRun = new File(appDir, "AppRun");				
-		FileUtils.createSymlink(appRun, new File(executable.getName()));
+		File appRun = new File(appDir, "AppRun");
+		FileUtils.createSymlink(appRun, new File("usr/bin", executable.getName()));
+
+		// creates AppRun symlink to startup script
+		Logger.info("Creating symlink to icon ...");
+		File appIconFile = new File(appDir, iconFile.getName());
+		FileUtils.createSymlink(appIconFile, new File("usr/bin", iconFile.getName()));
 
 		// runs appimagetool on appFolder
 		Logger.info("Running appimagetool on " + appFolder);

src/main/resources/linux/desktop-appimage.vtl

@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=${info.displayName}
+GenericName=${info.displayName}
+Comment=${info.description}
+Exec=${info.name} %U
+Icon=${info.name}.png
+Terminal=false
+Type=Application
+StartupNotify=true
+#if ($info.isThereFileAssociations())
+MimeType=${info.getMimeTypesListAsString(";")}
+#end
+Categories=Utility

src/main/resources/linux/desktop.vtl

@@ -9,5 +9,4 @@ Type=Application
 StartupNotify=true
 #if ($info.isThereFileAssociations())
 MimeType=${info.getMimeTypesListAsString(";")}
-#end
-Categories=Utility
+#end