Noesis: Fix CheckAndInstall

Also, Rollback changes to Github Actions
Lemon-King · Oct 16, 2023 · a1516f2 · a1516f2
1 parent 5223b6e
commit a1516f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/gluon-build-windows-release.yml b/.github/workflows/gluon-build-windows-release.yml
@@ -69,8 +69,7 @@ jobs:
         run: cp -r ${env:GRAALVM_HOME}/bin/awt.dll staging &&
           cp -r ${env:GRAALVM_HOME}/bin/java.dll staging &&
           cp -r ${env:GRAALVM_HOME}/bin/server/jvm.dll staging &&
-          cp -r ${env:GRAALVM_HOME}/bin/windowsaccessbridge-64.dll staging &&
-          cp -r ${env:GRAALVM_HOME}/bin/net.dll staging
+          cp -r ${env:GRAALVM_HOME}/bin/windowsaccessbridge-64.dll staging
 
       - name: Copy Licenses
         shell: pwsh

diff --git a/.github/workflows/gluon-build-windows.yml b/.github/workflows/gluon-build-windows.yml
@@ -65,8 +65,7 @@ jobs:
         run: cp -r ${env:GRAALVM_HOME}/bin/awt.dll staging &&
           cp -r ${env:GRAALVM_HOME}/bin/java.dll staging &&
           cp -r ${env:GRAALVM_HOME}/bin/server/jvm.dll staging &&
-          cp -r ${env:GRAALVM_HOME}/bin/windowsaccessbridge-64.dll staging &&
-          cp -r ${env:GRAALVM_HOME}/bin/net.dll staging
+          cp -r ${env:GRAALVM_HOME}/bin/windowsaccessbridge-64.dll staging
 
       - name: Copy Licenses
         shell: pwsh

diff --git a/src/main/java/lemon/hxdd/builder/Noesis.java b/src/main/java/lemon/hxdd/builder/Noesis.java
@@ -60,6 +60,7 @@ public boolean CheckAndInstall() {
                             os.write(zis.readAllBytes());
                             os.close();
                         }
+                        zis.closeEntry();
                     }
                     zis.close();
                     fis.close();
@@ -68,7 +69,7 @@ public boolean CheckAndInstall() {
                 }
             }
         }
-        return hasNoesis;
+        return new File(SETTINGS_PATH_NOESIS).exists();
     }
 
     public void ExtractPak(File pak, File destination) {