From 128e2f90ab321f806267a87740b4da45afc30ffe Mon Sep 17 00:00:00 2001
From: SuperPotato27 <superpotatoman27@gmail.com>
Date: Tue, 16 Jul 2024 11:48:59 -0400
Subject: [PATCH] adjust paths

---
 .github/workflows/hirs_package_linux.yml | 10 +++++-----
 tools/tcg_eventlog_tool/build.gradle     | 18 ++++++++++++++++++
 tools/tcg_rim_tool/build.gradle          | 20 ++------------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/hirs_package_linux.yml b/.github/workflows/hirs_package_linux.yml
index 016c1a82..4125312d 100644
--- a/.github/workflows/hirs_package_linux.yml
+++ b/.github/workflows/hirs_package_linux.yml
@@ -47,31 +47,31 @@ jobs:
           cp tools/tcg_rim_tool/build/distributions/*.zip artifacts/win
           cp package/win/tcg-rim-tool/*.ps1 artifacts/win
     - name: Archive RPM files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: RPM_Files
         path: HIRS_AttestationCAPortal/build/distributions/*.rpm
         if-no-files-found: error
     - name: Archive DEB files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: DEB_Files
         path: HIRS_AttestationCAPortal/build/distributions/*.deb
         if-no-files-found: error
     - name: War files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: WAR_Files
         path: HIRS_AttestationCAPortal/build/libs/HIRS_AttestationCAPortal.war
         if-no-files-found: error
     - name: JAR_Files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: JAR_Files
         path: artifacts/jars/
         if-no-files-found: error
     - name: ZIP_Files
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ZIP_Files
         path: artifacts/win/
diff --git a/tools/tcg_eventlog_tool/build.gradle b/tools/tcg_eventlog_tool/build.gradle
index 6775b515..8c19820a 100644
--- a/tools/tcg_eventlog_tool/build.gradle
+++ b/tools/tcg_eventlog_tool/build.gradle
@@ -123,4 +123,22 @@ ospackage {
     buildDeb {
         arch = X86_64
     }
+
 }
+
+//
+//task buildZip(type: Zip){
+//    dependsOn jar
+//    from(tasks.jar.archiveFile){
+//        into '/'
+//    }
+//
+////    arch = 'win'
+//    // project_subproject-release version_data-git commit hash-arch.extension
+//    archiveBaseName.set(project.name + '-' + jarVersion)
+//    archiveExtension.set('zip')
+//    destinationDirectory.set(file("$buildDir/distributions"))
+//}
+//
+//buildZip.dependsOn jar
+////build.dependsOn buildZip
\ No newline at end of file
diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle
index 6139a017..eeb324e4 100644
--- a/tools/tcg_rim_tool/build.gradle
+++ b/tools/tcg_rim_tool/build.gradle
@@ -137,28 +137,12 @@ task buildZip(type: Zip){
     from(tasks.jar.archiveFile){
         into '/'
     }
-    from('README.md') {
-        into '/'
-    }
     from('./build/resources/test/rim_fields.json'){
         into '/'
     }
-    from('../../package/win/tcg-rim-tool/rim.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/hirsshell.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/eventLog.ps1'){
-        into '/'
-    }
-    from('../../package/win/tcg-rim-tool/create_hirstools_desktop_shortcut.ps1'){
-        into '/'
-    }
 
-//    arch = 'win'
-    // project_subproject-release version_data-git commit hash-arch.extension
-    archiveBaseName.set(project.name + '-' + jarVersion)
+
+    archiveBaseName.set(project.name)
     archiveExtension.set('zip')
     destinationDirectory.set(file("$buildDir/distributions"))
 }