From 835e5db92fb10e893b386a8cc95da002f9839386 Mon Sep 17 00:00:00 2001
From: Adrian Malacoda <malacoda@monarch-pass.net>
Date: Sun, 30 May 2021 19:21:09 -0500
Subject: [PATCH] Replace maven wrapper with makefile install

---
 desktop/Makefile     | 12 ++++++++++++
 desktop/piecannon    | 20 --------------------
 desktop/piecannon.in |  2 ++
 3 files changed, 14 insertions(+), 20 deletions(-)
 create mode 100644 desktop/Makefile
 delete mode 100755 desktop/piecannon
 create mode 100644 desktop/piecannon.in

diff --git a/desktop/Makefile b/desktop/Makefile
new file mode 100644
index 0000000..d2b6aaf
--- /dev/null
+++ b/desktop/Makefile
@@ -0,0 +1,12 @@
+PREFIX=~/.local
+DEST=$(PREFIX)/lib/piecannon
+COMMAND=$(PREFIX)/bin/piecannon
+
+target:
+	mvn install
+	
+install: target
+	mkdir -p $(DEST)
+	cp target/piecannon-*.jar $(DEST)/piecannon.jar
+	sed "s#@JAR_PATH@#$(DEST)/piecannon.jar#g" piecannon.in > $(COMMAND)
+	chmod +x $(COMMAND)
diff --git a/desktop/piecannon b/desktop/piecannon
deleted file mode 100755
index 00989be..0000000
--- a/desktop/piecannon
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-PC_GROUP="net.monarchpass"
-PC_ARTIFACT="piecannon-desktop-app"
-PC_VERSION="0.0.1-SNAPSHOT"
-PC_CLASS="net.monarchpass.piecannon.App"
-
-STUB_POM="<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd'> <modelVersion>4.0.0</modelVersion> <groupId>$PC_GROUP</groupId> <artifactId>piecannon-launcher</artifactId> <version>$PC_VERSION</version> <dependencies> <dependency><groupId>$PC_GROUP</groupId><artifactId>$PC_ARTIFACT</artifactId><version>\${project.version}</version></dependency></dependencies></project>"
-STUB_POM_FILE=/tmp/pc.xml
-echo $STUB_POM > $STUB_POM_FILE
-
-OUTPUT=$(mvn -f $STUB_POM_FILE -B exec:java -Dexec.mainClass=$PC_CLASS -Dexec.arguments=$1 -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN)
-EXEC_RESULT=$?
-echo "$OUTPUT"
-
-if [ $EXEC_RESULT != 0 ]; then
-    exit $EXEC_RESULT;
-fi
-
-RESULT=$(echo "$OUTPUT" | tail -n 1)
-xdg-open $RESULT
diff --git a/desktop/piecannon.in b/desktop/piecannon.in
new file mode 100644
index 0000000..d9b3c65
--- /dev/null
+++ b/desktop/piecannon.in
@@ -0,0 +1,2 @@
+#!/bin/sh
+java -jar @JAR_PATH@ $@