From 401bea434047ab53e0713d8036d218a7582bab09 Mon Sep 17 00:00:00 2001
From: Naofal <naofal@naofal.xyz>
Date: Sat, 29 Mar 2025 21:08:50 +0300
Subject: [PATCH] Clean before packaging and use hashbang

---
 .gitignore |  1 +
 Build.java | 42 +++++++++++++++++++++++++++++++++---------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f2010b..8c24a36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 
 /third-party/downloads/*
 /third-party/**/*.jar
+/src/test/resources/downloads/*
 
 /*.jar
 /docs
diff --git a/Build.java b/Build.java
index d395e65..00b725d 100644
--- a/Build.java
+++ b/Build.java
@@ -1,10 +1,14 @@
 import static nobuild.NoBuild.*;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
 import java.util.ArrayDeque;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.logging.Level;
 import java.util.stream.Collectors;
 
 public class Build {
@@ -57,8 +61,9 @@ public class Build {
         break;
 
       case "package":
+        clean();
         buildJtags(mainClass, sourcePaths, classPaths);
-        packageJar(Optional.ofNullable(arguments.poll()));
+        packageJar(Optional.ofNullable(arguments.poll()).orElse("Jtags.jar"));
         break;
 
       case "test":
@@ -85,15 +90,34 @@ public class Build {
     }
   }
 
-  static void packageJar(Optional<String> jarfile) {
+  static void clean() {
+    command("rm", "-rf", buildClassPath + "/xyz");
+  }
+
+  static void packageJar(String jarfile) {
+    File file = new File(jarfile);
+    file.delete();
+
     command(
-        "jar",
-        "cfe",
-        jarfile.orElse("Jtags.jar"),
-        "xyz.naofal.jtags.Jtags",
-        "-C",
-        buildClassPath,
-        ".");
+        "jar", "cfe", jarfile, "xyz.naofal.jtags.Jtags", "-C", buildClassPath, "xyz/naofal/jtags");
+
+    // Make jar file executable by hashbang
+    byte[] hashbang = "#!/usr/bin/env -S java -jar\n".getBytes();
+    int fileLength = (int) file.length();
+    int length = fileLength + hashbang.length;
+    byte[] bytes = new byte[length];
+    System.arraycopy(hashbang, 0, bytes, 0, hashbang.length);
+    try {
+      FileInputStream in = new FileInputStream(file);
+      in.read(bytes, hashbang.length, fileLength);
+      in.close();
+      FileOutputStream out = new FileOutputStream(file);
+      out.write(bytes);
+      out.close();
+    } catch (Exception ex) {
+      logger.log(Level.SEVERE, "Problem during file IO with " + jarfile, ex);
+    }
+    file.setExecutable(true);
   }
 
   static void runTests(String[] args) {