From 72bceebde8d21fcde457b4875a30974437092e3f Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 22 Jun 2025 11:40:19 +1200 Subject: [PATCH] 'Generic Commit' --- getpkg/test.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/getpkg/test.sh b/getpkg/test.sh index 614bd04..372f51c 100755 --- a/getpkg/test.sh +++ b/getpkg/test.sh @@ -45,13 +45,18 @@ cleanup() { # Remove local test directories rm -rf "$TEST_DIR" rm -rf ~/.config/getpkg/"${TEST_TOOL_NAME}.json" 2>/dev/null || true + rm -rf ~/.config/getpkg/"${TEST_TOOL_NAME}-noarch.json" 2>/dev/null || true + rm -rf ~/.getpkg/"${TEST_TOOL_NAME}" 2>/dev/null || true + rm -rf ~/.getpkg/"${TEST_TOOL_NAME}-noarch" 2>/dev/null || true rm -rf ~/.local/bin/getpkg/"${TEST_TOOL_NAME}" 2>/dev/null || true + rm -rf ~/.local/bin/getpkg/"${TEST_TOOL_NAME}-noarch" 2>/dev/null || true # Remove test tool from bashrc_getpkg if it exists # if [ -f ~/.bashrc_getpkg ]; then # sed -i "/${TEST_TOOL_NAME}/d" ~/.bashrc_getpkg 2>/dev/null || true # fi $GETPKG uninstall "$TEST_TOOL_NAME" 2>/dev/null || true + $GETPKG uninstall "${TEST_TOOL_NAME}-noarch" 2>/dev/null || true # Clean up from getpkg.xyz if we have write access if [ -n "${SOS_WRITE_TOKEN:-}" ]; then @@ -294,7 +299,7 @@ if [ -n "${SOS_WRITE_TOKEN:-}" ]; then # Test 10: Check installed files echo -e "\nTest 10: Check installed files" - if [ -f ~/.config/getpkg/"${TEST_TOOL_NAME}.json" ] && [ -d ~/.local/bin/getpkg/"${TEST_TOOL_NAME}" ]; then + if [ -f ~/.config/getpkg/"${TEST_TOOL_NAME}.json" ] && [ -d ~/.getpkg/"${TEST_TOOL_NAME}" ] && [ -L ~/.local/bin/getpkg/"${TEST_TOOL_NAME}" ]; then print_test_result "Tool files installed correctly" 0 else print_test_result "Tool files installed correctly" 1 @@ -311,7 +316,8 @@ if [ -n "${SOS_WRITE_TOKEN:-}" ]; then # Test 12: Direct tool name install (shortcut syntax) echo -e "\nTest 12: Direct tool install syntax" # First remove the tool - rm -rf ~/.local/bin/getpkg/"${TEST_TOOL_NAME}" + rm -rf ~/.getpkg/"${TEST_TOOL_NAME}" + rm -rf ~/.local/bin/getpkg/"${TEST_TOOL_NAME}" rm -f ~/.config/getpkg/"${TEST_TOOL_NAME}.json" DIRECT_INSTALL_OUTPUT=$(timeout 3 "$GETPKG" "$TEST_TOOL_NAME" 2>&1) || DIRECT_INSTALL_OUTPUT="" @@ -382,7 +388,7 @@ EOF # Test 13c: Install universal tool (arch fallback) echo -e "\nTest 13c: Install universal tool (arch fallback)" - rm -rf ~/.config/getpkg/"${TEST_TOOL_NOARCH}.json" ~/.local/bin/getpkg/"${TEST_TOOL_NOARCH}" 2>/dev/null || true + rm -rf ~/.config/getpkg/"${TEST_TOOL_NOARCH}.json" ~/.getpkg/"${TEST_TOOL_NOARCH}" ~/.local/bin/getpkg/"${TEST_TOOL_NOARCH}" 2>/dev/null || true FALLBACK_INSTALL_OUTPUT=$(timeout 3 "$GETPKG" install "${TEST_TOOL_NOARCH}" 2>&1) || FALLBACK_INSTALL_OUTPUT="" if [[ "$FALLBACK_INSTALL_OUTPUT" =~ Arch-specific\ version\ not\ found,\ trying\ universal\ version ]] && [[ "$FALLBACK_INSTALL_OUTPUT" =~ Installed\ ${TEST_TOOL_NOARCH}\ successfully ]]; then print_test_result "Install universal tool with arch fallback" 0