From 0d6d9a8442f7bbccf41f9c6b8780c2b0c603a35e Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Wed, 14 Nov 2018 18:57:58 +0100
Subject: [PATCH] Create assembly descriptors for all platforms w/ and w/o JRE

---
 pom.xml                                       |  3 +-
 src/assembly/ctbrec-linux-jre.sh              |  7 +++++
 ctbrec.sh => src/assembly/ctbrec-linux.sh     |  4 +--
 .../assembly/ctbrec-macos-jre.sh              |  0
 src/assembly/ctbrec-macos.sh                  |  8 +++++
 src/assembly/{win32-jre.xml => linux-jre.xml} | 21 +++++++------
 src/assembly/linux.xml                        |  6 ++--
 src/assembly/macos-jre.xml                    |  8 +++--
 src/assembly/macos.xml                        | 30 +++++++++++++++++++
 src/assembly/server-jre.bat                   |  1 +
 src/assembly/server-linux-jre.sh              |  6 ++++
 server.sh => src/assembly/server-linux.sh     |  3 ++
 .../assembly/server-macos-jre.sh              |  0
 src/assembly/server-macos.sh                  |  8 +++++
 server.bat => src/assembly/server.bat         |  0
 src/assembly/win64-jre.xml                    |  5 ++--
 src/assembly/win64.xml                        |  2 +-
 17 files changed, 90 insertions(+), 22 deletions(-)
 create mode 100755 src/assembly/ctbrec-linux-jre.sh
 rename ctbrec.sh => src/assembly/ctbrec-linux.sh (76%)
 rename ctbrec-macos.sh => src/assembly/ctbrec-macos-jre.sh (100%)
 create mode 100755 src/assembly/ctbrec-macos.sh
 rename src/assembly/{win32-jre.xml => linux-jre.xml} (64%)
 create mode 100644 src/assembly/macos.xml
 create mode 100755 src/assembly/server-jre.bat
 create mode 100755 src/assembly/server-linux-jre.sh
 rename server.sh => src/assembly/server-linux.sh (74%)
 rename server-macos.sh => src/assembly/server-macos-jre.sh (100%)
 create mode 100755 src/assembly/server-macos.sh
 rename server.bat => src/assembly/server.bat (100%)

diff --git a/pom.xml b/pom.xml
index 25e5ea19..9cd367a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,6 @@
 									<descriptors>
 										<descriptor>src/assembly/win64.xml</descriptor>
 										<descriptor>src/assembly/win64-jre.xml</descriptor>
-										<descriptor>src/assembly/win32-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
 							</execution>
@@ -241,6 +240,7 @@
 								<configuration>
 									<descriptors>
 										<descriptor>src/assembly/linux.xml</descriptor>
+										<descriptor>src/assembly/linux-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
 							</execution>
@@ -271,6 +271,7 @@
 								</goals>
 								<configuration>
 									<descriptors>
+										<descriptor>src/assembly/macos.xml</descriptor>
 										<descriptor>src/assembly/macos-jre.xml</descriptor>
 									</descriptors>
 								</configuration>
diff --git a/src/assembly/ctbrec-linux-jre.sh b/src/assembly/ctbrec-linux-jre.sh
new file mode 100755
index 00000000..6c68d4d8
--- /dev/null
+++ b/src/assembly/ctbrec-linux-jre.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+pushd $(dirname $0)
+JAVA=./jre/bin/java
+$JAVA -version
+$JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
+popd
diff --git a/ctbrec.sh b/src/assembly/ctbrec-linux.sh
similarity index 76%
rename from ctbrec.sh
rename to src/assembly/ctbrec-linux.sh
index 34bcfff9..df9c22eb 100755
--- a/ctbrec.sh
+++ b/src/assembly/ctbrec-linux.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-#JAVA=/opt/jdk-10.0.1/bin/java
+pushd $(dirname $0)
 JAVA=java
-
 $JAVA -version
 $JAVA -Djdk.gtk.version=3 -cp ${name.final}.jar ctbrec.ui.Launcher
+popd
diff --git a/ctbrec-macos.sh b/src/assembly/ctbrec-macos-jre.sh
similarity index 100%
rename from ctbrec-macos.sh
rename to src/assembly/ctbrec-macos-jre.sh
diff --git a/src/assembly/ctbrec-macos.sh b/src/assembly/ctbrec-macos.sh
new file mode 100755
index 00000000..8de2a9cf
--- /dev/null
+++ b/src/assembly/ctbrec-macos.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DIR=$(dirname $0)
+pushd $DIR
+JAVA=java
+$JAVA -version
+$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher
+popd
\ No newline at end of file
diff --git a/src/assembly/win32-jre.xml b/src/assembly/linux-jre.xml
similarity index 64%
rename from src/assembly/win32-jre.xml
rename to src/assembly/linux-jre.xml
index c76fff23..a110eddf 100644
--- a/src/assembly/win32-jre.xml
+++ b/src/assembly/linux-jre.xml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly>
-	<id>win32-jre</id>
+	<id>linux-jre</id>
 	<formats>
 		<format>zip</format>
 	</formats>
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<files>
 		<file>
-			<source>${project.build.directory}/ctbrec.exe</source>
-			<outputDirectory>ctbrec</outputDirectory>
-		</file>
-		<file>
-			<source>${project.basedir}/server.bat</source>
+			<source>${project.basedir}/src/assembly/ctbrec-linux-jre.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>ctbrec.sh</destName>
 		</file>
-        <file>
-			<source>${project.basedir}/src/main/resources/pp.bat</source>
+		<file>
+			<source>${project.basedir}/src/assembly/server-linux-jre.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+			<destName>server.sh</destName>
 		</file>
-        <file>
-			<source>${project.basedir}/src/main/resources/pp.ps1</source>
+		<file>
+			<source>${project.basedir}/src/main/resources/pp.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
 		<file>
@@ -30,7 +29,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jre1.8.0_192_win32</directory>
+			<directory>jre/jdk-11.0.1_linux</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/src/assembly/linux.xml b/src/assembly/linux.xml
index 83413326..090a542d 100644
--- a/src/assembly/linux.xml
+++ b/src/assembly/linux.xml
@@ -7,14 +7,16 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<files>
 		<file>
-			<source>${project.basedir}/ctbrec.sh</source>
+			<source>${project.basedir}/src/assembly/ctbrec-linux.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>ctbrec.sh</destName>
 		</file>
 		<file>
-			<source>${project.basedir}/server.sh</source>
+			<source>${project.basedir}/src/assembly/server-linux.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>server.sh</destName>
 		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.sh</source>
diff --git a/src/assembly/macos-jre.xml b/src/assembly/macos-jre.xml
index 84a87a90..972db8f3 100644
--- a/src/assembly/macos-jre.xml
+++ b/src/assembly/macos-jre.xml
@@ -7,14 +7,16 @@
 	<includeBaseDirectory>false</includeBaseDirectory>
 	<files>
 		<file>
-			<source>${project.basedir}/ctbrec-macos.sh</source>
+			<source>${project.basedir}/src/assembly/ctbrec-macos-jre.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>ctbrec.sh</destName>
 		</file>
 		<file>
-			<source>${project.basedir}/server-macos.sh</source>
+			<source>${project.basedir}/src/assembly/server-macos-jre.sh</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>server.sh</destName>
 		</file>
 		<file>
 			<source>${project.basedir}/src/main/resources/pp.sh</source>
@@ -27,7 +29,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jre1.8.0_192_macos</directory>
+			<directory>jre/jdk-11.0.1_macos</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/src/assembly/macos.xml b/src/assembly/macos.xml
new file mode 100644
index 00000000..f9de5d0d
--- /dev/null
+++ b/src/assembly/macos.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+	<id>macos</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<files>
+		<file>
+			<source>${project.basedir}/src/assembly/ctbrec-macos.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+			<destName>ctbrec.sh</destName>
+		</file>
+		<file>
+			<source>${project.basedir}/src/assembly/server-macos.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+			<destName>server.sh</destName>
+		</file>
+		<file>
+			<source>${project.basedir}/src/main/resources/pp.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+		<file>
+			<source>${project.build.directory}/${name.final}.jar</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+	</files>
+</assembly>
diff --git a/src/assembly/server-jre.bat b/src/assembly/server-jre.bat
new file mode 100755
index 00000000..43548d72
--- /dev/null
+++ b/src/assembly/server-jre.bat
@@ -0,0 +1 @@
+jre\bin\java -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
\ No newline at end of file
diff --git a/src/assembly/server-linux-jre.sh b/src/assembly/server-linux-jre.sh
new file mode 100755
index 00000000..f81e58d5
--- /dev/null
+++ b/src/assembly/server-linux-jre.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+pushd $(dirname $0)
+JAVA=./jre/bin/java
+$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+popd
diff --git a/server.sh b/src/assembly/server-linux.sh
similarity index 74%
rename from server.sh
rename to src/assembly/server-linux.sh
index 5f1126cd..1ecc85a4 100755
--- a/server.sh
+++ b/src/assembly/server-linux.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
+pushd $(dirname $0)
 JAVA=java
+$JAVA -version
 $JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+popd
\ No newline at end of file
diff --git a/server-macos.sh b/src/assembly/server-macos-jre.sh
similarity index 100%
rename from server-macos.sh
rename to src/assembly/server-macos-jre.sh
diff --git a/src/assembly/server-macos.sh b/src/assembly/server-macos.sh
new file mode 100755
index 00000000..90ea865b
--- /dev/null
+++ b/src/assembly/server-macos.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+DIR=$(dirname $0)
+pushd $DIR
+JAVA=java
+$JAVA -version
+$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+popd
diff --git a/server.bat b/src/assembly/server.bat
similarity index 100%
rename from server.bat
rename to src/assembly/server.bat
diff --git a/src/assembly/win64-jre.xml b/src/assembly/win64-jre.xml
index 81000d7e..e81eb163 100644
--- a/src/assembly/win64-jre.xml
+++ b/src/assembly/win64-jre.xml
@@ -11,9 +11,10 @@
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
 		<file>
-			<source>${project.basedir}/server.bat</source>
+			<source>${project.basedir}/src/assembly/server-jre.bat</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
+			<destName>server.bat</destName>
 		</file>
         <file>
 			<source>${project.basedir}/src/main/resources/pp.bat</source>
@@ -30,7 +31,7 @@
 	</files>
 	<fileSets>
 		<fileSet>
-			<directory>jre/jre1.8.0_192_win64</directory>
+			<directory>jre/jdk-11.0.1_win64</directory>
 			<includes>
 				<include>**/*</include>
 			</includes>
diff --git a/src/assembly/win64.xml b/src/assembly/win64.xml
index f637dd44..5cc92821 100644
--- a/src/assembly/win64.xml
+++ b/src/assembly/win64.xml
@@ -11,7 +11,7 @@
 			<outputDirectory>ctbrec</outputDirectory>
 		</file>
 		<file>
-			<source>${project.basedir}/server.bat</source>
+			<source>${project.basedir}/src/assembly/server.bat</source>
 			<outputDirectory>ctbrec</outputDirectory>
 			<filtered>true</filtered>
 		</file>