From aafe20648ee1da00de2ff2b4c74a35a0b47782c3 Mon Sep 17 00:00:00 2001
From: Andrew Leonard <anleonar@redhat.com>
Date: Wed, 29 Nov 2023 11:06:40 +0000
Subject: [PATCH] Signing verifier job

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
 pipelines/build/common/verify_signing.groovy | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pipelines/build/common/verify_signing.groovy b/pipelines/build/common/verify_signing.groovy
index 8b8966e2a..447c0a748 100644
--- a/pipelines/build/common/verify_signing.groovy
+++ b/pipelines/build/common/verify_signing.groovy
@@ -85,7 +85,6 @@ void unpackArchives(String unpack_dir, String[] archives) {
             sh '''
                 #!/bin/bash
                 set -eu
-                pwd
                 FILES=$(find "${dir}" -type f -name '*.jmod')
                 for f in $FILES
                 do
@@ -93,17 +92,17 @@ void unpackArchives(String unpack_dir, String[] archives) {
                     expand_dir="${dir}/expanded_${expand_dir}"
                     mkdir "${expand_dir}"
                     echo "Expanding JMOD ${f}"
-                    "${jdk_bin}/jmod extract --dir ${expand_dir} ${f}"
+                    ${jdk_bin}/jmod extract --dir ${expand_dir} ${f}
                 done
 
                 FILES=$(find "${dir}" -type f -name 'modules')
                 for f in $FILES
                 do  
                     expand_dir=$(basename ${f})
-                    expand_dir="${dir}/${expand_dir}"
+                    expand_dir="${dir}/expanded_${expand_dir}"
                     mkdir "${expand_dir}"
                     echo "Expanding compressed image file ${f}"
-                    "${jdk_bin}/jimage extract --dir ${expand_dir} ${f}"
+                    ${jdk_bin}/jimage extract --dir ${expand_dir} ${f}
                 done
             '''
         }