fix for sha issue

Signed-off-by: Adam Farley <[email protected]>
adoptium · Dec 17, 2024 · 3a742dc · 3a742dc
1 parent 901aa93
commit 3a742dc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/lib/functionLibrary.sh b/lib/functionLibrary.sh
@@ -61,10 +61,8 @@ function checkFileSha() {
     return 1
   fi
 
-  if [[ ! -x "${2}" ]]; then
+  if [[ ! `ls "${2}" &> /dev/null` ]]; then
     info "The file we're trying to check does not exist: ${2}"
-    scriptLocation="${2}"
-    echo "D2: $(ls ${scriptLocation%/*})"
     return 1
   fi
 

diff --git a/lib/tests/functionLibraryTests.sh b/lib/tests/functionLibraryTests.sh
@@ -57,12 +57,8 @@ function infoTests(){
 # checkFileSha
 function checkFileShaTests(){
   # Does it work when it should?
-  info "enable" "logging"
   checkFileSha "${sampleFileSha}" "${scriptDir}/${sampleFileName}"
   testResults "checkFileShaTest 1" "$?"
-  echo "D1: $(ls ${scriptDir})"
-  echo "checkFileSha ${sampleFileSha} ${scriptDir}/${sampleFileName}"
-  info "disable" "logging"
 
   # Does it fail when we have the wrong sha?
   checkFileSha "12345" "${scriptDir}/${sampleFileName}" &> /dev/null