resilient install.sh fie

This commit is contained in:
Bartal Læarsson
2025-03-02 21:53:03 +00:00
parent 762eb94ee0
commit 128f260a3f
+38 -6
View File
@@ -28,16 +28,40 @@ esac
# Binary paths # Binary paths
BINARY_NAME="provision" BINARY_NAME="provision"
BINARY_PATH="bin/${OS}_${GOARCH}/${BINARY_NAME}" SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
REPO_ROOT="$(dirname "$SCRIPT_DIR")"
# Determine if we're running from the cli directory or from the repo root
if [[ "$(basename "$SCRIPT_DIR")" == "cli" ]]; then
# Running from cli directory
BIN_DIR="$SCRIPT_DIR/bin"
else
# Check if we have a cli subdirectory, which suggests we're in the repo root
if [[ -d "$SCRIPT_DIR/cli" ]]; then
BIN_DIR="$SCRIPT_DIR/cli/bin"
else
echo -e "${RED}✗ Error:${NC} Cannot determine the correct path to the binary."
echo "This script should be run either:"
echo " 1. From the repository root as ./cli/install.sh"
echo " 2. From the cli directory as ./install.sh"
exit 1
fi
fi
BINARY_PATH="$BIN_DIR/${OS}_${GOARCH}/${BINARY_NAME}"
INSTALL_DIR="$HOME/.local/bin" INSTALL_DIR="$HOME/.local/bin"
echo "Installing infrastructure CLI tool..." echo "Installing infrastructure CLI tool..."
echo "Looking for binary at: $BINARY_PATH"
# Ensure .local directory exists # Ensure .local directory exists
mkdir -p "$HOME/.local" mkdir -p "$HOME/.local"
# Check and fix .local/bin directory ownership if needed # Check and fix .local/bin directory ownership if needed
if [ "$(stat -c '%U' "$INSTALL_DIR" 2>/dev/null)" != "$USER" ]; then if [ ! -d "$INSTALL_DIR" ]; then
mkdir -m 755 -p "$INSTALL_DIR"
echo -e "${GREEN}✓${NC} Created bin directory with secure permissions"
elif [ "$(stat -c '%U' "$INSTALL_DIR" 2>/dev/null)" != "$USER" ]; then
echo -e "${YELLOW}⚠${NC} Fixing directory ownership..." echo -e "${YELLOW}⚠${NC} Fixing directory ownership..."
if command -v sudo >/dev/null; then if command -v sudo >/dev/null; then
sudo chown -R "$USER:$USER" "$INSTALL_DIR" sudo chown -R "$USER:$USER" "$INSTALL_DIR"
@@ -47,13 +71,21 @@ if [ "$(stat -c '%U' "$INSTALL_DIR" 2>/dev/null)" != "$USER" ]; then
fi fi
fi fi
# Ensure .local/bin directory exists with correct permissions
mkdir -m 755 -p "$INSTALL_DIR"
# Check if the binary exists for this platform # Check if the binary exists for this platform
if [ ! -f "$BINARY_PATH" ]; then if [ ! -f "$BINARY_PATH" ]; then
echo -e "${RED}✗ Error:${NC} Binary not found for your platform: ${OS}_${GOARCH}" echo -e "${RED}✗ Error:${NC} Binary not found for your platform: ${OS}_${GOARCH}"
echo "Please compile the binary for your platform or contact the repository maintainer." echo "Path checked: $BINARY_PATH"
echo ""
echo "Possible solutions:"
echo " 1. Make sure you're running this script from the correct directory:"
echo " - From the repository root: ./cli/install.sh"
echo " - From the cli directory: ./install.sh"
echo ""
echo " 2. If the binary doesn't exist, you may need to build it:"
echo " cd cli"
echo " go build -o bin/${OS}_${GOARCH}/${BINARY_NAME} ./cmd/provision"
echo ""
echo " 3. Check if your OS/architecture (${OS}_${GOARCH}) is supported"
exit 1 exit 1
fi fi