[acquire/acquire_openssl.h] Exit early on non-zero exit code ; [acquire/tests/test_extract.h] Remove test that only works when I download miniz & zip ; [.github/workflows/github-actions.yml] Use raw package names for vcpkg under windows ; [acquire/tests/CMakeLists.txt] Remove some debug statements

Author: SamuelMarks

.github/workflows/github-actions.yml

@@ -55,7 +55,7 @@ jobs:
         if: matrix.os != 'windows-latest'
 
       - name: Install vcpkg ports (Windows) --triplet "${{ runner.arch }}-${{ runner.os }}"
-        run: ./vcpkg/vcpkg install --classic $(jq '.dependencies[] | select(type == "string")' vcpkg.json)
+        run: ./vcpkg/vcpkg install --classic $(jq -r '.dependencies[] | select(type == "string")' vcpkg.json)
         if: matrix.os == 'windows-latest' && steps.cache-vcpkg.outputs.cache-hit != 'true'
 
       - name: Install vcpkg ports (macOS, Linux)

acquire/acquire_openssl.h

@@ -235,7 +235,8 @@ int sha512_file(const char *filename,
 #define LIBACQUIRE_SHA256_IMPL
 bool sha256(const char *filename, const char *hash) {
   unsigned char sha_output[SHA256_DIGEST_LENGTH * 2 + 1];
-  sha256_file(filename, sha_output);
+  if (sha256_file(filename, sha_output) != 0)
+    return false;
 
   return strcmp((const char *)sha_output, hash) == 0;
 }
@@ -245,7 +246,8 @@ bool sha256(const char *filename, const char *hash) {
 #define LIBACQUIRE_SHA512_IMPL
 bool sha512(const char *filename, const char *hash) {
   unsigned char sha_output[SHA512_DIGEST_LENGTH * 2 + 1];
-  sha512_file(filename, sha_output);
+  if (sha512_file(filename, sha_output) != 0)
+    return false;
 
   return strcmp((const char *)sha_output, hash) == 0;
 }

acquire/tests/CMakeLists.txt

@@ -133,7 +133,6 @@ foreach (EXEC_NAME ${_targets})
     if (LIBACQUIRE_USE_MINIZ)
         find_package(kubazip CONFIG REQUIRED)
         target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
-        message(STATUS "LINKING zip here")
     endif (LIBACQUIRE_USE_MINIZ)
 
     target_include_directories(
@@ -174,7 +173,6 @@ foreach (ARCHIVE_LIB ${_archives})
 
         find_package(kubazip CONFIG REQUIRED)
         target_link_libraries("${EXEC_NAME}" PRIVATE kubazip::kubazip)
-        message(STATUS "LINKING zip")
     elseif (LIBACQUIRE_USE_LIBARCHIVE)
         set_source_files_properties("test_extract.c"
                 PROPERTIES COMPILE_DEFINITIONS "LIBACQUIRE_IMPLEMENTATION=1;LIBACQUIRE_USE_LIBARCHIVE=1")

acquire/tests/test_extract.h

@@ -47,12 +47,8 @@ TEST x_test_extract_archive(void) {
                EXIT_SUCCESS);
 
   /* Could add a comprehensive file check here */
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "readme.md"));
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.h"));
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.c"));
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "ChangeLog.md"));
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "LICENSE"));
-  ASSERT_FALSE(!is_directory(EXTRACT_DIR PATH_SEP "examples"));
+  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "greatest.h"));
+  ASSERT_FALSE(!is_directory(EXTRACT_DIR));
 
 #undef EXTRACT_DIR
   PASS();