A bootstrap script support for gradle

fvarrui · fvarrui · commit 55175e9185f6 · 2021-08-23T10:50:46.000+01:00
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackagePluginExtension.java
@@ -11,6 +11,7 @@
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.model.Scripts;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.PackagerSettings;
 
@@ -49,6 +50,7 @@ public PackagePluginExtension(Project project) {
 		this.vmArgs = new ArrayList<>();
 		this.winConfig = new WindowsConfig();
 		this.outputDirectory = project.getBuildDir();
+		this.scripts = new Scripts();
 	}
 	
     public LinuxConfig linuxConfig(Closure<LinuxConfig> closure) {
@@ -74,5 +76,11 @@ public Manifest manifest(Closure<Manifest> closure) {
         project.configure(manifest, closure);
         return manifest;
     }
+    
+    public Scripts scripts(Closure<Scripts> closure) {
+        scripts = new Scripts();
+        project.configure(scripts, closure);
+        return scripts;
+    }
 
 }
diff --git a/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java b/src/main/java/io/github/fvarrui/javapackager/gradle/PackageTask.java
@@ -19,6 +19,7 @@
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.model.Scripts;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 import io.github.fvarrui.javapackager.packagers.Context;
 import io.github.fvarrui.javapackager.packagers.Packager;
@@ -540,6 +541,24 @@ public List<FileAssociation> getFileAssociations() {
 	public void setFileAssociations(List<FileAssociation> fileAssociations) {
 		this.fileAssociations = fileAssociations;
 	}
+	
+	@Input
+	@Optional
+	private Scripts scripts;
+	
+	public Scripts getScripts() {
+		return scripts;
+	}
+	
+	public void setScripts(Scripts scripts) {
+		this.scripts = scripts;
+	}
+	
+    public Scripts scripts(Closure<Scripts> closure) {
+    	scripts = new Scripts();
+        getProject().configure(scripts, closure);
+        return scripts;
+    }
 
 	// ===============
 	// create packager
@@ -589,6 +608,7 @@ protected Packager createPackager() throws Exception {
 					.outputDirectory(defaultIfNull(outputDirectory, extension.getOutputDirectory()))
 					.packagingJdk(defaultIfNull(packagingJdk, extension.getPackagingJdk(), Context.getContext().getDefaultToolchain()))
 					.runnableJar(defaultIfNull(runnableJar, extension.getRunnableJar()))
+					.scripts(defaultIfNull(scripts, extension.getScripts()))
 					.useResourcesAsWorkingDir(defaultIfNull(useResourcesAsWorkingDir, extension.isUseResourcesAsWorkingDir()))
 					.url(defaultIfNull(url, extension.getUrl()))
 					.version(defaultIfNull(version, extension.getVersion(), getProject().getVersion().toString()))
diff --git a/src/main/java/io/github/fvarrui/javapackager/model/Scripts.java b/src/main/java/io/github/fvarrui/javapackager/model/Scripts.java
@@ -0,0 +1,40 @@
+package io.github.fvarrui.javapackager.model;
+
+import java.io.File;
+
+public class Scripts {
+
+	private File bootstrap;
+	private File preInstall;
+	private File postInstall;
+
+	public File getBootstrap() {
+		return bootstrap;
+	}
+
+	public void setBootstrap(File bootstrap) {
+		this.bootstrap = bootstrap;
+	}
+
+	public File getPreInstall() {
+		return preInstall;
+	}
+
+	public void setPreInstall(File preInstall) {
+		this.preInstall = preInstall;
+	}
+
+	public File getPostInstall() {
+		return postInstall;
+	}
+
+	public void setPostInstall(File postInstall) {
+		this.postInstall = postInstall;
+	}
+
+	@Override
+	public String toString() {
+		return "Scripts [bootstrap=" + bootstrap + ", preInstall=" + preInstall + ", postInstall=" + postInstall + "]";
+	}
+
+}
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java b/src/main/java/io/github/fvarrui/javapackager/packagers/Packager.java
@@ -198,6 +198,18 @@ protected void copyAdditionalResources(List<File> resources, File destination) {
 			}
 		});
 		
+		// copy bootstrap script
+		if (getScripts().getBootstrap() != null && getScripts().getBootstrap().exists()) {
+			File scriptsFolder = new File(destination, "scripts");
+			File bootstrapFile = new File(scriptsFolder, "bootstrap"); 
+			try {
+				FileUtils.copyFileToFile(getScripts().getBootstrap(), bootstrapFile);
+				bootstrapFile.setExecutable(true, false);
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		
 		Logger.infoUnindent("All additional resources copied!");
 		
 	}
diff --git a/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java b/src/main/java/io/github/fvarrui/javapackager/packagers/PackagerSettings.java
@@ -13,6 +13,7 @@
 import io.github.fvarrui.javapackager.model.MacConfig;
 import io.github.fvarrui.javapackager.model.Manifest;
 import io.github.fvarrui.javapackager.model.Platform;
+import io.github.fvarrui.javapackager.model.Scripts;
 import io.github.fvarrui.javapackager.model.WindowsConfig;
 
 /**
@@ -61,15 +62,12 @@ public class PackagerSettings {
 	protected List<File> additionalModulePaths;
 	protected List<FileAssociation> fileAssociations;
 	protected File packagingJdk;
+	protected Scripts scripts;
 
 	public File getPackagingJdk() {
 		return packagingJdk;
 	}
 
-	public void setPackagingJdk(File packagingJdk) {
-		this.packagingJdk = packagingJdk;
-	}
-
 	public File getOutputDirectory() {
 		return outputDirectory;
 	}
@@ -230,6 +228,10 @@ public List<FileAssociation> getFileAssociations() {
 		return fileAssociations;
 	}
 
+	public Scripts getScripts() {
+		return scripts;
+	}
+
 	// fluent api
 
 	public PackagerSettings outputDirectory(File outputDirectory) {
@@ -436,21 +438,21 @@ public PackagerSettings fileAssociations(List<FileAssociation> fileAssociations)
 		this.fileAssociations = fileAssociations;
 		return this;
 	}
-	
+
+	public PackagerSettings scripts(Scripts scripts) {
+		this.scripts = scripts;
+		return this;
+	}
+
 	// some helpful methods
-	
+
 	public boolean isThereFileAssociations() {
 		return fileAssociations != null && !fileAssociations.isEmpty();
 	}
-	
+
 	public String getMimeTypesListAsString(String separator) {
-		return StringUtils.join(
-					fileAssociations
-						.stream()
-						.map(fa -> fa.getMimeType())
-						.collect(Collectors.toList()),
-					separator
-					);
+		return StringUtils.join(fileAssociations.stream().map(fa -> fa.getMimeType()).collect(Collectors.toList()),
+				separator);
 	}
 
 	@Override
@@ -468,10 +470,8 @@ public String toString() {
 				+ macConfig + ", createTarball=" + createTarball + ", createZipball=" + createZipball + ", extra="
 				+ extra + ", useResourcesAsWorkingDir=" + useResourcesAsWorkingDir + ", assetsDir=" + assetsDir
 				+ ", classpath=" + classpath + ", jreMinVersion=" + jreMinVersion + ", manifest=" + manifest
-				+ ", additionalModulePaths=" + additionalModulePaths + ", packagingJdk=" + packagingJdk + 
-				", fileAssociations=" + fileAssociations + "]";
+				+ ", additionalModulePaths=" + additionalModulePaths + ", fileAssociations=" + fileAssociations
+				+ ", packagingJdk=" + packagingJdk + ", scripts=" + scripts + "]";
 	}
 
-
-
 }
diff --git a/src/main/resources/linux/assembly.xml.vtl b/src/main/resources/linux/assembly.xml.vtl
@@ -14,6 +14,7 @@
 #if ($info.bundleJre)				
 				<exclude>${info.jreDirectoryName}/bin/*</exclude>
 				<exclude>${info.jreDirectoryName}/lib/jspawnhelper</exclude>
+				<exclude>scripts/*</exclude>
 #end
 			</excludes>
 		</fileSet>
@@ -25,6 +26,7 @@
 #if ($info.bundleJre)				
 				<include>${info.jreDirectoryName}/bin/*</include>
 				<include>${info.jreDirectoryName}/lib/jspawnhelper</include>
+				<include>scripts/*</include>
 #end
 			</includes>
 			<fileMode>0755</fileMode>
diff --git a/src/main/resources/linux/startup.sh.vtl b/src/main/resources/linux/startup.sh.vtl
@@ -76,13 +76,11 @@ JVMClassPath+=":${classpath}"
 cd "$SCRIPTPATH"
 #end
 
+#if ($info.scripts.bootstrap)
 # invoke bootstrap script
 $Bootstrap=$SCRIPTPATH/scripts/bootstrap
-#if ($info.administratorRequired)
-[ -x "$Bootstrap" ] && pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 $Bootstrap
-#else
 [ -x "$Bootstrap" ] && $Bootstrap
-#fi
+#end
 
 #if ($info.administratorRequired)
 pkexec env DISPLAY=$DISPLAY XAUTHORITY=$XAUTHORITY GDKBACKEND=x11 $JAVA $JVMDefaultOptions -cp $JVMClassPath ${info.mainClass} $@
diff --git a/src/main/resources/mac/assembly.xml.vtl b/src/main/resources/mac/assembly.xml.vtl
@@ -15,6 +15,7 @@
 #if ($info.bundleJre)
 				<exclude>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/bin/*</exclude>
 				<exclude>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/lib/jspawnhelper</exclude>
+				<exclude>Contents/Resources/scripts/*</exclude>
 #end
 			</excludes>
 		</fileSet>
@@ -27,6 +28,7 @@
 #if ($info.bundleJre)
 				<include>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/bin/*</include>
 				<include>Contents/PlugIns/${info.jreDirectoryName}/Contents/Home/lib/jspawnhelper</include>
+				<include>Contents/Resources/scripts/*</include>
 #end
 			</includes>
 			<fileMode>0755</fileMode>
