From 1fb8333e5f045255564510e2cad85a347bd09dc0 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Sun, 22 Jun 2025 12:03:18 +1200
Subject: [PATCH] 'Generic Commit'

---
 getpkg/src/GetbinClient.cpp |  7 -------
 getpkg/test.sh              | 16 +++++++---------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/getpkg/src/GetbinClient.cpp b/getpkg/src/GetbinClient.cpp
index 3632005..05185ed 100644
--- a/getpkg/src/GetbinClient.cpp
+++ b/getpkg/src/GetbinClient.cpp
@@ -66,7 +66,6 @@ bool GetbinClient::download(const std::string& toolName, const std::string& arch
         // Configure SSL certificates for HTTPS
         std::string ca_path = find_ca_certificates();
         if (!ca_path.empty()) {
-            std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
             // Use addSSLConfigs with proper parameter names for OpenSSL
             std::vector<std::pair<std::string, std::string>> sslConfigs;
             sslConfigs.push_back({"VerifyCAFile", ca_path});
@@ -147,7 +146,6 @@ bool GetbinClient::upload(const std::string& archivePath, std::string& outUrl, s
         // Configure SSL certificates
         std::string ca_path = find_ca_certificates();
         if (!ca_path.empty()) {
-            std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
             std::vector<std::pair<std::string, std::string>> sslConfigs;
             sslConfigs.push_back({"VerifyCAFile", ca_path});
             client->addSSLConfigs(sslConfigs);
@@ -245,7 +243,6 @@ bool GetbinClient::getHash(const std::string& toolName, const std::string& arch,
         // Configure SSL certificates
         std::string ca_path = find_ca_certificates();
         if (!ca_path.empty()) {
-            std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
             std::vector<std::pair<std::string, std::string>> sslConfigs;
             sslConfigs.push_back({"VerifyCAFile", ca_path});
             client->addSSLConfigs(sslConfigs);
@@ -320,7 +317,6 @@ bool GetbinClient::deleteObject(const std::string& hash, const std::string& toke
         // Configure SSL certificates
         std::string ca_path = find_ca_certificates();
         if (!ca_path.empty()) {
-            std::cerr << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
             std::vector<std::pair<std::string, std::string>> sslConfigs;
             sslConfigs.push_back({"VerifyCAFile", ca_path});
             client->addSSLConfigs(sslConfigs);
@@ -384,9 +380,6 @@ bool GetbinClient::listPackages(std::vector<std::string>& outPackages) {
     
     // Set up SSL configuration
     std::string ca_path = find_ca_certificates();
-    if (!ca_path.empty()) {
-        std::cout << "[GetbinClient] Found CA certificates at: " << ca_path << std::endl;
-    }
     
     bool success = false;
     bool done = false;
diff --git a/getpkg/test.sh b/getpkg/test.sh
index 095c85f..3741969 100755
--- a/getpkg/test.sh
+++ b/getpkg/test.sh
@@ -62,15 +62,13 @@ cleanup() {
     if [ -n "${SOS_WRITE_TOKEN:-}" ]; then
         echo "Attempting to clean up test objects from getpkg.xyz..."
         
-        # Get the hash of our test tool if it exists
-        HASH=$(curl -s "https://getpkg.xyz/hash/${TEST_TOOL_NAME}:${TEST_ARCH}" 2>/dev/null || echo "")
-        if [ -n "$HASH" ] && [ "$HASH" != "null" ] && [ "$HASH" != "Not found" ]; then
-            echo "Found test tool hash: $HASH"
-            # Delete the object
-            curl -s -H "Authorization: Bearer ${SOS_WRITE_TOKEN}" \
-                "https://getpkg.xyz/deleteobject?hash=${HASH}" >/dev/null 2>&1 || true
-            echo "Cleaned up test tool from getpkg.xyz"
-        fi
+        # Clean up main architecture variant
+        $GETPKG unpublish "${TEST_TOOL_NAME}:${TEST_ARCH}" 2>/dev/null || true
+        
+        # Clean up noarch variant
+        $GETPKG unpublish "${TEST_TOOL_NAME}-noarch:universal" 2>/dev/null || true
+        
+        echo "Cleaned up test tools from getpkg.xyz"
     else
         echo "Note: SOS_WRITE_TOKEN not set, cannot clean up remote test objects"
     fi