From d458d20471b508702763c767f61e43f7b239132f Mon Sep 17 00:00:00 2001
From: Ondrej Zizka <ondrej.zizka@nexxiot.com>
Date: Tue, 3 Dec 2024 00:42:54 +0100
Subject: [PATCH] Fix the bin script pointing to a wrong name of the dist jar.

---
 README.md                  | 2 +-
 docs/RELEASING.md          | 2 +-
 pom.xml                    | 3 ++-
 src/main/assembly-dist.xml | 2 +-
 src/scripts/crunch         | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 73db521..252c863 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Download & run
   ```
 
     Requires [Java 11](https://adoptopenjdk.net/releases.html) or later.    
-    If you run `java -jar csv-cruncher-single.jar` directly, do not add `crunch`.  
+    If you run `java -jar csv-cruncher-fatjar.jar` directly, do not add `crunch`.  
     You might need to make the `crunch` script executable depending on your OS (until issue #): `chmod +x crunch`
 
 
diff --git a/docs/RELEASING.md b/docs/RELEASING.md
index 0675631..5df3d94 100644
--- a/docs/RELEASING.md
+++ b/docs/RELEASING.md
@@ -51,4 +51,4 @@ How to release
 5) Go to GitHub and [create a new release](https://github.com/OndraZizka/csv-cruncher/releases/new):
    * Name is like `<version> <main new feature>`
    * Description describes what's new, and contains the usage example
-   * Attach the files `csv-cruncher-<version>-dist.jar` and `...-single.jar` 
+   * Attach the files `csv-cruncher-<version>-dist.jar` and `...-fatjar.jar` 
diff --git a/pom.xml b/pom.xml
index 861d7e0..a4d850f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,10 +106,11 @@
                 <groupId>org.apache.maven.plugins</groupId><artifactId>maven-assembly-plugin</artifactId><version>3.7.1</version>
                 <executions>
 
+                    <!-- Disabled, because it does not include resources. Possibly a bug? -->
                     <execution>
                         <id>single-DISABLED</id> <!-- Was before MJAR-233: assembleDistJar -->
                         <goals><goal>single</goal></goals>
-                        <phase>none</phase> <!-- Disabled, trying a custom descriptor -->
+                        <phase>none</phase>
                         <configuration>
                             <finalName>${project.artifactId}-${project.version}-single</finalName>
                             <archive>
diff --git a/src/main/assembly-dist.xml b/src/main/assembly-dist.xml
index 93c6771..dd0cc80 100644
--- a/src/main/assembly-dist.xml
+++ b/src/main/assembly-dist.xml
@@ -26,7 +26,7 @@
             <directory>${project.build.directory}</directory>
             <outputDirectory>.</outputDirectory>
             <includes>
-                <include>*-single.jar</include>
+                <include>*-fatjar.jar</include>
             </includes>
         </fileSet>
         <fileSet>
diff --git a/src/scripts/crunch b/src/scripts/crunch
index 877a9a5..b78fb25 100755
--- a/src/scripts/crunch
+++ b/src/scripts/crunch
@@ -23,7 +23,7 @@ SCRIPT_DIR=$(dirname $(realpath $0))
 
 #echo "In script PWD:"`pwd`;
 #echo "TOOL_HOME: $TOOL_HOME";
-java -Djava.util.logging.config.file="$SCRIPT_DIR/jul.properties" -jar "$SCRIPT_DIR"/csv-cruncher-*-single.jar "$@"
+java -Djava.util.logging.config.file="$SCRIPT_DIR/jul.properties" -jar "$SCRIPT_DIR"/csv-cruncher-*-fatjar.jar "$@"
 
 
 ## Cleanup