From 573c87d485d6af37d637f6810fbbf648d7fd3190 Mon Sep 17 00:00:00 2001
From: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Date: Thu, 3 Oct 2024 13:40:50 +0300
Subject: [PATCH] Switch to tar.gz assembly

---
 DEV-GUIDE.md                                   | 2 +-
 install-snapshot.sh                            | 7 ++++---
 jjava/assembly/{zip/zip.xml => kernelspec.xml} | 5 +----
 jjava/pom.xml                                  | 8 +++++---
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename jjava/assembly/{zip/zip.xml => kernelspec.xml} (91%)

diff --git a/DEV-GUIDE.md b/DEV-GUIDE.md
index bacdaba..1cee9e4 100644
--- a/DEV-GUIDE.md
+++ b/DEV-GUIDE.md
@@ -9,7 +9,7 @@ Alternatively, you could just build it and install as with any release version:
 
 ```bash
 mvn clean package
-unzip -u "${BUILD_DIR}".zip -d "${TARGET_PATH}"
+mkdir -p "${TARGET_PATH}" && tar -xzf "${BUILD_DIR}".tar.gz -C "${TARGET_PATH}"
 jupyter kernelspec install "${TARGET_PATH}" --name=java --user
 ```
 
diff --git a/install-snapshot.sh b/install-snapshot.sh
index 036e318..81dd5f8 100644
--- a/install-snapshot.sh
+++ b/install-snapshot.sh
@@ -7,9 +7,10 @@
 #
 
 BUILD_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
-BUILD_DIR="jjava/target/jjava-${BUILD_VERSION}"
+BUILD_DIR="jjava/target/jjava-${BUILD_VERSION}-kernelspec"
 KERNEL_DIR="$(pwd)/${BUILD_DIR}"
 
 mvn clean package || exit 1
-unzip -u "${BUILD_DIR}".zip -d "${BUILD_DIR}" || exit 1
-jupyter kernelspec install "${KERNEL_DIR}" --name=java --user || exit 1
+mkdir -p "${BUILD_DIR}" || exit 2
+tar -xzf "${BUILD_DIR}".tar.gz -C "${BUILD_DIR}" || exit 3
+jupyter kernelspec install "${KERNEL_DIR}" --name=java --user || exit 4
diff --git a/jjava/assembly/zip/zip.xml b/jjava/assembly/kernelspec.xml
similarity index 91%
rename from jjava/assembly/zip/zip.xml
rename to jjava/assembly/kernelspec.xml
index a6b3e4d..07e74a1 100644
--- a/jjava/assembly/zip/zip.xml
+++ b/jjava/assembly/kernelspec.xml
@@ -1,10 +1,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
-    <id>zip</id>
-    <formats>
-        <format>zip</format>
-    </formats>
+    <id>kernelspec</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <files>
         <file>
diff --git a/jjava/pom.xml b/jjava/pom.xml
index b6d448a..a5b903b 100644
--- a/jjava/pom.xml
+++ b/jjava/pom.xml
@@ -113,16 +113,18 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>assemble-zip</id>
+                        <id>assemble-kernelspec</id>
                         <phase>package</phase>
                         <goals>
                             <goal>single</goal>
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>assembly/zip/zip.xml</descriptor>
+                                <descriptor>assembly/kernelspec.xml</descriptor>
                             </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
+                            <formats>
+                                <format>tar.gz</format>
+                            </formats>
                         </configuration>
                     </execution>
                 </executions>