From ca1cd8b8ac2304808d39df1862c946e5f661104b Mon Sep 17 00:00:00 2001
From: Kevin Belisle <kev.belisle@gmail.com>
Date: Tue, 6 Jul 2021 17:23:47 -0400
Subject: [PATCH] Fix to run jar from command line

---
 app/build.gradle.kts                          | 6 ++++++
 app/src/main/kotlin/xyz/etztech/stonks/Api.kt | 5 ++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2ea08d4..f4976af 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -72,6 +72,12 @@ tasks.register<Copy>("copySinglePageApp") {
     into(layout.buildDirectory.dir("resources/main/spa"))
 }
 
+tasks.withType<Jar> {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    manifest { attributes["Main-Class"] = "xyz.etztech.stonks.AppKt" }
+    configurations["compileClasspath"].forEach { file: File -> from(zipTree(file.absoluteFile)) }
+}
+
 application {
     // Define the main class for the application.
     mainClass.set("xyz.etztech.stonks.AppKt")
diff --git a/app/src/main/kotlin/xyz/etztech/stonks/Api.kt b/app/src/main/kotlin/xyz/etztech/stonks/Api.kt
index 2ca3785..835c2f2 100644
--- a/app/src/main/kotlin/xyz/etztech/stonks/Api.kt
+++ b/app/src/main/kotlin/xyz/etztech/stonks/Api.kt
@@ -24,9 +24,8 @@ fun initApiServer(apiServerPort: Int, database: Database) {
     val app =
             Javalin.create { config ->
                         config.enableCorsForAllOrigins()
-                        config.addStaticFiles("./spa")
-                        config.addStaticFiles("/")
-                        config.addSinglePageRoot("/", "./spa")
+                        config.addStaticFiles("spa")
+                        config.addSinglePageRoot("/", "spa")
                         config.enforceSsl = false
                         config.ignoreTrailingSlashes = true
                     }