From 1b0b5f18a4b173d44dbe659b88b70ec3bbf41377 Mon Sep 17 00:00:00 2001
From: 0xboobface <0xboobface@gmail.com>
Date: Tue, 30 Oct 2018 18:21:13 +0100
Subject: [PATCH] Add assembly descriptor for macOS

---
 ctbrec-macos.sh            |  9 +++++++++
 pom.xml                    |  3 ++-
 server-macos.sh            |  9 +++++++++
 src/assembly/macos-jre.xml | 34 ++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100755 ctbrec-macos.sh
 create mode 100755 server-macos.sh
 create mode 100644 src/assembly/macos-jre.xml

diff --git a/ctbrec-macos.sh b/ctbrec-macos.sh
new file mode 100755
index 00000000..f28903cc
--- /dev/null
+++ b/ctbrec-macos.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DIR=$(dirname $0)
+pushd $DIR
+JAVA_HOME="$DIR/jre/Contents/Home"
+JAVA="$JAVA_HOME/bin/java"
+$JAVA -version
+$JAVA -cp ${name.final}.jar ctbrec.ui.Launcher
+popd
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f38886a0..77b1df4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,6 +66,7 @@
 								<descriptor>src/assembly/win64-jre.xml</descriptor>
                                 <descriptor>src/assembly/win32-jre.xml</descriptor>
 								<descriptor>src/assembly/linux.xml</descriptor>
+								<descriptor>src/assembly/macos-jre.xml</descriptor>
 							</descriptors>
 						</configuration>
 					</execution>
@@ -77,7 +78,7 @@
 				<version>1.7.22</version>
 				<executions>
 					<execution>
-						<id>l4j-clui</id>
+						<id>l4j-win</id>
 						<phase>package</phase>
 						<goals>
 							<goal>launch4j</goal>
diff --git a/server-macos.sh b/server-macos.sh
new file mode 100755
index 00000000..7ab059e4
--- /dev/null
+++ b/server-macos.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+DIR=$(dirname $0)
+pushd $DIR
+JAVA_HOME="$DIR/jre/Contents/Home"
+JAVA="$JAVA_HOME/bin/java"
+$JAVA -version
+$JAVA -cp ${name.final}.jar -Dctbrec.config=server.json ctbrec.recorder.server.HttpServer
+popd
diff --git a/src/assembly/macos-jre.xml b/src/assembly/macos-jre.xml
new file mode 100644
index 00000000..c8a1c261
--- /dev/null
+++ b/src/assembly/macos-jre.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<assembly>
+	<id>macos-jre</id>
+	<formats>
+		<format>zip</format>
+	</formats>
+	<includeBaseDirectory>false</includeBaseDirectory>
+	<files>
+		<file>
+			<source>${project.basedir}/ctbrec-macos.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+		<file>
+			<source>${project.basedir}/server-macos.sh</source>
+			<outputDirectory>ctbrec</outputDirectory>
+			<filtered>true</filtered>
+		</file>
+		<file>
+			<source>${project.build.directory}/${name.final}.jar</source>
+			<outputDirectory>ctbrec</outputDirectory>
+		</file>
+	</files>
+	<fileSets>
+		<fileSet>
+			<directory>jre/jre1.8.0_192_macos</directory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+			<outputDirectory>ctbrec/jre</outputDirectory>
+			<filtered>false</filtered>
+		</fileSet>
+	</fileSets>
+</assembly>