Merge pull request #96 from xpdota/linux-clickthrough

Linux clickthrough
xpdota · Jul 22, 2022 · d30c73c · d30c73c
2 parents 35ec898 + dfccdb1
commit d30c73c
Show file tree

Hide file tree

Showing 21 changed files with 2,458 additions and 53 deletions.
diff --git a/launcher/pom.xml b/launcher/pom.xml
@@ -72,6 +72,20 @@
                             <appendAssemblyId>false</appendAssemblyId>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>zip-file-linux</id>
+                        <phase>install</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/assembly/bin-linux.xml</descriptor>
+                            </descriptors>
+                            <finalName>triggevent-linux</finalName>
+                            <appendAssemblyId>false</appendAssemblyId>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>
@@ -164,6 +178,24 @@
 
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-linux-scripts</id>
+                        <!-- here the phase you need -->
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${basedir}/target/windows</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${project.basedir}/src/linux</directory>
+                                    <includes>*.sh</includes>
+                                </resource>
+                            </resources>
+
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
             <plugin>

diff --git a/launcher/src/assembly/bin-linux.xml b/launcher/src/assembly/bin-linux.xml
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
+    <id>zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <baseDirectory>${project.basedir}</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/target/windows</directory>
+            <outputDirectory>triggevent</outputDirectory>
+            <excludes>
+                <exclude>**/src.zip</exclude>
+                <exclude>jre/</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/launcher/src/assembly/bin-no-jre.xml b/launcher/src/assembly/bin-no-jre.xml
@@ -13,6 +13,7 @@
             <excludes>
                 <exclude>**/src.zip</exclude>
                 <exclude>jre/</exclude>
+                <exclude>*.sh</exclude>
             </excludes>
         </fileSet>
     </fileSets>

diff --git a/launcher/src/assembly/bin.xml b/launcher/src/assembly/bin.xml
@@ -12,6 +12,7 @@
             <outputDirectory>triggevent</outputDirectory>
             <excludes>
                 <exclude>**/src.zip</exclude>
+                <exclude>*.sh</exclude>
             </excludes>
         </fileSet>
     </fileSets>

diff --git a/launcher/src/linux/setup-java.sh b/launcher/src/linux/setup-java.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if wget -O /tmp/java.tar.gz https://download.oracle.com/java/17/archive/jdk-17.0.4_linux-x64_bin.tar.gz
+then
+  tar -xzf /tmp/java.tar.gz
+  mv jdk-* jre
+else
+  echo "Download failed"
+fi
diff --git a/launcher/src/linux/triggevent-import.sh b/launcher/src/linux/triggevent-import.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -x jre/bin/java ]
+then
+  java=jre/bin/java
+  echo "Using directory-supplied Java"
+else
+  java=$(command -v java)
+  if [ $? -ne 0 ]
+  then
+    echo "Found neither a 'jre' dir nor a built in 'java' executable. Please do one of the following to fix it:"
+    echo "1. Install Java 17 from your distro's package manager, and make sure the 'java' program on your PATH points to the correct java installation."
+    echo "2. Download Java 17 from https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html and place it in a directory called 'jre' (rename it from jdk-x.y.z)"
+    echo "3. Run setup-java.sh (requires wget)"
+    exit 1;
+  fi
+fi
+
+$java -cp './userdata:./preload/*:./deps/*:./user/*:launcher-1.0-SNAPSHOT.jar' @args.txt gg.xp.xivsupport.gui.GuiImportLaunch
diff --git a/launcher/src/linux/triggevent-upd.sh b/launcher/src/linux/triggevent-upd.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -x jre/bin/java ]
+then
+  java=jre/bin/java
+  echo "Using directory-supplied Java"
+else
+  java=$(command -v java)
+  if [ $? -ne 0 ]
+  then
+    echo "Found neither a 'jre' dir nor a built in 'java' executable. Please do one of the following to fix it:"
+    echo "1. Install Java 17 from your distro's package manager, and make sure the 'java' program on your PATH points to the correct java installation."
+    echo "2. Download Java 17 from https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html and place it in a directory called 'jre' (rename it from jdk-x.y.z)"
+    echo "3. Run setup-java.sh (requires wget)"
+    exit 1;
+  fi
+fi
+
+$java -cp 'launcher-1.0-SNAPSHOT.jar' @args.txt gg.xp.xivsupport.gui.Update
diff --git a/launcher/src/linux/triggevent.sh b/launcher/src/linux/triggevent.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ -x jre/bin/java ]
+then
+  java=jre/bin/java
+  echo "Using directory-supplied Java"
+else
+  java=$(command -v java)
+  if [ $? -ne 0 ]
+  then
+    echo "Found neither a 'jre' dir nor a built in 'java' executable. Please do one of the following to fix it:"
+    echo "1. Install Java 17 from your distro's package manager, and make sure the 'java' program on your PATH points to the correct java installation."
+    echo "2. Download Java 17 from https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html and place it in a directory called 'jre' (rename it from jdk-x.y.z)"
+    echo "3. Run setup-java.sh (requires wget)"
+    exit 1;
+  fi
+fi
+
+$java -cp './userdata:./preload/*:./deps/*:./user/*:launcher-1.0-SNAPSHOT.jar' @args.txt gg.xp.xivsupport.gui.GuiLaunch
diff --git a/launcher/src/main/java/gg/xp/xivsupport/gui/Update.java b/launcher/src/main/java/gg/xp/xivsupport/gui/Update.java
@@ -336,7 +336,12 @@ else if (depsFiles == null) {
 				if (!updateTheUpdaterItself) {
 					Runtime.getRuntime().addShutdownHook(new Thread(() -> {
 						try {
-							Runtime.getRuntime().exec(Paths.get(installDir.toString(), "triggevent.exe").toString());
+							if (isWindows()) {
+								Runtime.getRuntime().exec(Paths.get(installDir.toString(), "triggevent.exe").toString());
+							}
+							else {
+								Runtime.getRuntime().exec(new String[]{"sh", Paths.get(installDir.toString(), "triggevent.sh").toString()});
+							}
 						}
 						catch (IOException e) {
 							e.printStackTrace();
@@ -400,4 +405,8 @@ private static String getStackTrace(final Throwable throwable) {
 		return sw.getBuffer().toString();
 	}
 
+	private static boolean isWindows() {
+		return System.getProperty("os.name").toLowerCase(Locale.ROOT).contains("windows");
+	}
+
 }
diff --git a/libjawt.so b/libjawt.so
diff --git a/pom.xml b/pom.xml
@@ -56,6 +56,7 @@
                         <threadCount>1</threadCount>
                         <perCoreThreadCount>true</perCoreThreadCount>
                         <argLine>-Duser.country=US -Duser.language=en -DsequentialTriggerCycleTime=1000</argLine>
+                        <trimStackTrace>false</trimStackTrace>
                     </configuration>
                 </plugin>
                 <plugin>