From ee11b5ffe4b5df4ffc65c5d66b5badc5a686dae8 Mon Sep 17 00:00:00 2001
From: Branislav Stojkovic <bancika@gmail.com>
Date: Tue, 11 Mar 2025 15:03:09 +0100
Subject: [PATCH] fix mavenized

---
 diylc/.DS_Store                               | Bin 6148 -> 6148 bytes
 diylc/diylc-swing/.DS_Store                   | Bin 8196 -> 8196 bytes
 diylc/diylc-swing/deploy/linux/run.sh         |   7 +++-
 diylc/diylc-swing/pom.xml                     |  38 +++++++++++++++---
 .../src/main/java/org/diylc/DIYLCStarter.java |   4 --
 5 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/diylc/.DS_Store b/diylc/.DS_Store
index d2504ceb58165dcf54820f0468e156c3e94bd763..ba7e385a77c0337b1e23fb140215753a695763d1 100644
GIT binary patch
delta 176
zcmZoMXffEZoQ2)eOh>`c*nILjmPE#VlLc6nIK@Q8B}65qq+}*rv)+-87vL|>$S?Oy
z&d&=dN-fJwEsw|qvV$|LQYRa+smUliBs(yG0EYl$NM3$kDkrD1LjYKWVRAN`qNOCG
z5~DVw38O8eJ);L>AY%|?2xBB;6k{|*4HF}TW{`!_P>L~SG7pQ?=DTe2jGNgx{_+C=
DLW&~E

delta 164
zcmZoMXffEZoQ2)kLPx>S(sc4VmPE$QlLc6nI7LOp#6=|}r6ea?v)+-8$V|@93(l-c
zjThiA&d4wK1abq4Qp++^%O@MLsR?rkFoxvi=cRHgI|ML*0q5irHbrv*MkPjVMiWL`
tMtepNMo&g>#sJ1Z#wdsqCPoO&AOoeL6l3(}b8ME36C1cUvvd6A2LPwYA&vk5

diff --git a/diylc/diylc-swing/.DS_Store b/diylc/diylc-swing/.DS_Store
index 225a94344de13c3eeeb10e906836917f24fdb49b..8a6ff28feff3becd352fd80098746a46b129da89 100644
GIT binary patch
delta 342
zcmZp1XmOa}&nUhzU^hRb_+}n~dyIxs3@Hq$3<W@(2WI6lBr{Yp=rR-mMN$|_fjkhc
z3sjNMkjtRQP%$}CNSL*ofq_A9^L;^kMs{|H)Z{DyX~ubzg@xPG*ceI}5`hM!1GScT
z=Hw?Q<>V&;H3%>;F#ZJMy8mDR6k%XMQJYj=TmV(OBdH)Kv$({-;2I+nGYcylI|n-l
zH%Dx6Mt*s4Nn%N9vD0KmLFbU*%#_rm#3Bw(4$gQ1iRx-&OEVn>Lu2z=9ffL3BLf`;
z6JxX5T22m8Wqs?Q`0SkAy!<Y(y$p<u5SoD(O2eq`$<u{5Y%I28+RQHTgGGvvI%_5X
D^yN)*

delta 46
zcmV+}0MY-1K!iY$PXQCLP`eKS6SE8u-T|{d5;Osmpc8zP92KpzM-0FNvj-UX1hIMr
E17}eWJ^%m!

diff --git a/diylc/diylc-swing/deploy/linux/run.sh b/diylc/diylc-swing/deploy/linux/run.sh
index f39fd36c..7f78069a 100755
--- a/diylc/diylc-swing/deploy/linux/run.sh
+++ b/diylc/diylc-swing/deploy/linux/run.sh
@@ -1,2 +1,5 @@
-#!/bin/bash
-exec java -Xms512m -Xmx4096m -javaagent:lib/jar-loader.jar -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp diylc.jar:lib --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED  --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED  org.diylc.DIYLCStarter "$@"
\ No newline at end of file
+#!/usr/bin/env bash
+JAVA_BIN="$(which java)"
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+CLASS_PATH="${DIR}/diylc.jar"
+exec java -Xms512m -Xmx4096m -Dorg.diylc.scriptRun=true -Dfile.encoding=UTF-8 -cp "$CLASS_PATH" --add-exports java.desktop/com.apple.eawt.event=ALL-UNNAMED --add-exports java.desktop/com.apple.eio=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED --add-opens java.desktop/java.awt=ALL-UNNAMED --add-opens java.desktop/java.awt.font=ALL-UNNAMED --add-opens java.desktop/java.awt.geom=ALL-UNNAMED  org.diylc.DIYLCStarter "$@"
\ No newline at end of file
diff --git a/diylc/diylc-swing/pom.xml b/diylc/diylc-swing/pom.xml
index 6e939966..45583f12 100644
--- a/diylc/diylc-swing/pom.xml
+++ b/diylc/diylc-swing/pom.xml
@@ -124,11 +124,6 @@
             <artifactId>gerber-writer-api-1.0.0</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.diylc.local</groupId>
-            <artifactId>jar-loader</artifactId>
-            <version>1.0</version>
-        </dependency>
         <dependency>
             <groupId>org.diylc.local</groupId>
             <artifactId>java-http-proxy</artifactId>
@@ -187,4 +182,37 @@
             </plugin>
         </plugins>
     </build>
+    
+    <profiles>
+        <profile>
+            <id>linux-zip</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <version>3.5.0</version>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>deploy/linux/linux-zip.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>make-assembly</id>
+                                <configuration>
+                                    <finalName>diylc-${project.version}</finalName>
+                                    <appendAssemblyId>false</appendAssemblyId>>
+                                </configuration>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
index 3c41772b..5ad6b6b6 100644
--- a/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
+++ b/diylc/diylc-swing/src/main/java/org/diylc/DIYLCStarter.java
@@ -35,7 +35,6 @@ import org.diylc.appframework.miscutils.Utils;
 import org.diylc.swingframework.export.DrawingExporter;
 import org.diylc.swingframework.fonts.FontOptimizer;
 import com.thoughtworks.xstream.XStream;
-import ca.cgjennings.jvm.JarLoader;
 import org.diylc.common.IPlugInPort;
 import org.diylc.core.IView;
 import org.diylc.lang.LangUtil;
@@ -61,7 +60,6 @@ public class DIYLCStarter {
 
 	/**
 	 * @param args
-	 * @throws InvalidActivityException
 	 */
 	public static void main(String[] args) {
 		try {
@@ -106,8 +104,6 @@ public class DIYLCStarter {
 		// disable HIGHLIGHT_CONTINUITY_AREA config, keep it transient
 		ConfigurationManager.getInstance().writeValue(IPlugInPort.HIGHLIGHT_CONTINUITY_AREA, false);
 
-		LOG.info("JarLoader strategy: " + JarLoader.getStrategy());
-
 		LOG.info("Loading languages...");
 
 		LangUtil.configure();