cleanup

Signed-off-by: Ryan Northey <[email protected]>

Author: phlax

.github/workflows/copilot-setup-steps.yml

@@ -94,4 +94,3 @@ jobs:
         sudo cp pants-wrapper.sh /usr/local/bin/pants
         sudo chmod +x /usr/local/bin/pants
         echo "PANTS_CA_CERTS_PATH=/etc/ssl/certs/ca-certificates.crt" >> $GITHUB_ENV
-        pants --version

pants-wrapper.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Pants wrapper script that auto-installs pants if not already available
-# 
+#
 # This wrapper is installed to /usr/local/bin/pants during Copilot setup.
 # It allows users to just run "pants" without worrying about installation.
 #
@@ -13,44 +13,44 @@
 
 set -euo pipefail
 
-# Check if pants exists in ~/.local/bin (default install location)
-if [ -x "$HOME/.local/bin/pants" ]; then
-    exec "$HOME/.local/bin/pants" "$@"
-fi
+GET_PANTS="${GET_PANTS:-}"
 
-# pants is not installed, install it now
-echo "Pants not found. Installing pants..." >&2
 
-# Find the repository root (where get-pants.sh should be)
-REPO_ROOT="${REPO_ROOT:-}"
-if [ -z "$REPO_ROOT" ]; then
-    # Try to find get-pants.sh
-    if [ -f "get-pants.sh" ]; then
-        REPO_ROOT="$(pwd)"
-    elif [ -f "../get-pants.sh" ]; then
-        REPO_ROOT="$(cd .. && pwd)"
-    elif [ -f "/home/runner/work/toolshed/toolshed/get-pants.sh" ]; then
-        REPO_ROOT="/home/runner/work/toolshed/toolshed"
-    else
-        echo "Error: Cannot find get-pants.sh. Please set REPO_ROOT or run from repository directory." >&2
-        exit 1
+run_pants () {
+    if [[ -x "$HOME/.local/bin/pants" ]]; then
+        exec "$HOME/.local/bin/pants" "$@"
+        exit 0
     fi
-fi
+}
 
-# Run get-pants.sh to install pants
-if [ -f "$REPO_ROOT/get-pants.sh" ]; then
-    echo "Running get-pants.sh from $REPO_ROOT..." >&2
-    cd "$REPO_ROOT"
-    ./get-pants.sh
-    
-    # Now that pants is installed, execute it
-    if [ -x "$HOME/.local/bin/pants" ]; then
-        exec "$HOME/.local/bin/pants" "$@"
-    else
-        echo "Error: pants installation failed" >&2
-        exit 1
+find_get_pants () {
+    if [[ -z "$GET_PANTS" ]]; then
+        # Try to find get-pants.sh
+        if [[ -f "get-pants.sh" ]]; then
+            GET_PANTS="$(realpath ./get-pants.sh)"
+        elif [[ -f "../get-pants.sh" ]]; then
+            GET_PANTS="$(realpath ../get-pants.sh)"
+        elif [[ -f "/home/runner/work/toolshed/toolshed/get-pants.sh" ]]; then
+            GET_PANTS="/home/runner/work/toolshed/toolshed/get-pants.sh"
+        else
+            echo "Error: Cannot find get-pants.sh. Please set GET_PANTS or run from repository directory." >&2
+            exit 1
+        fi
     fi
-else
-    echo "Error: get-pants.sh not found in $REPO_ROOT" >&2
-    exit 1
-fi
+    if [[ ! -f "$GET_PANTS" ]]; then
+        echo "Error: Cannot find get-pants.sh (${GET_PANTS})." >&2
+    fi
+}
+
+install_pants () {
+    echo "Pants not found. Installing pants..." >&2
+    find_get_pants
+    echo "Running get-pants.sh from $GET_PANTS..." >&2
+    "${GET_PANTS}"
+}
+
+run_pants "${@}"
+install_pants
+run_pants "${@}"
+echo "Error: pants installation failed" >&2
+exit 1