diff --git a/cli/bin/darwin_amd64/provision b/cli/bin/darwin_amd64/provision new file mode 100755 index 0000000..5dee871 Binary files /dev/null and b/cli/bin/darwin_amd64/provision differ diff --git a/cli/bin/darwin_arm64/provision b/cli/bin/darwin_arm64/provision new file mode 100755 index 0000000..9bd4b84 Binary files /dev/null and b/cli/bin/darwin_arm64/provision differ diff --git a/cli/bin/linux_amd64/provision b/cli/bin/linux_amd64/provision new file mode 100755 index 0000000..cd3cae9 Binary files /dev/null and b/cli/bin/linux_amd64/provision differ diff --git a/cli/bin/linux_arm64/provision b/cli/bin/linux_arm64/provision new file mode 100755 index 0000000..20cbb49 Binary files /dev/null and b/cli/bin/linux_arm64/provision differ diff --git a/cli/bin/windows_amd64/provision.exe b/cli/bin/windows_amd64/provision.exe new file mode 100755 index 0000000..6f2a45e Binary files /dev/null and b/cli/bin/windows_amd64/provision.exe differ diff --git a/cli/cmd/provision/kubernetes/provision.go b/cli/cmd/provision/kubernetes/provision.go index b34ca1d..d651ac4 100644 --- a/cli/cmd/provision/kubernetes/provision.go +++ b/cli/cmd/provision/kubernetes/provision.go @@ -34,7 +34,9 @@ func LoadDefaultConfig() (*Config, error) { data, err := os.ReadFile(defaultsPath) if err != nil { - return nil, fmt.Errorf("failed to read defaults file: %w", err) + return nil, fmt.Errorf("Could not find configuration file. Please run this command from the 'cli' directory of the project repository. "+ + "Make sure you are in the correct directory and the file exists at: %s", + defaultsPath) } config := &Config{} diff --git a/cli/install.sh b/cli/install.sh old mode 100644 new mode 100755 index d237fbe..3758a1b --- a/cli/install.sh +++ b/cli/install.sh @@ -33,6 +33,23 @@ INSTALL_DIR="$HOME/.local/bin" echo "Installing infrastructure CLI tool..." +# Ensure .local directory exists +mkdir -p "$HOME/.local" + +# Check and fix .local/bin directory ownership if needed +if [ "$(stat -c '%U' "$INSTALL_DIR" 2>/dev/null)" != "$USER" ]; then + echo -e "${YELLOW}⚠${NC} Fixing directory ownership..." + if command -v sudo >/dev/null; then + sudo chown -R "$USER:$USER" "$INSTALL_DIR" + else + echo -e "${RED}✗ Error:${NC} Cannot fix directory ownership. sudo not available." + exit 1 + fi +fi + +# Ensure .local/bin directory exists with correct permissions +mkdir -m 755 -p "$INSTALL_DIR" + # Check if the binary exists for this platform if [ ! -f "$BINARY_PATH" ]; then echo -e "${RED}✗ Error:${NC} Binary not found for your platform: ${OS}_${GOARCH}" @@ -40,25 +57,27 @@ if [ ! -f "$BINARY_PATH" ]; then exit 1 fi -# Create installation directory if it doesn't exist -mkdir -p "$INSTALL_DIR" +# Try copying the binary +if cp "$BINARY_PATH" "$INSTALL_DIR/$BINARY_NAME"; then + chmod 755 "$INSTALL_DIR/$BINARY_NAME" + echo -e "${GREEN}✓${NC} Installation successful!" +else + echo -e "${RED}✗ Error:${NC} Failed to copy binary. Check directory permissions." + echo "Current .local/bin permissions:" + ls -ld "$INSTALL_DIR" + exit 1 +fi -# Copy binary to installation directory -cp "$BINARY_PATH" "$INSTALL_DIR/$BINARY_NAME" -chmod +x "$INSTALL_DIR/$BINARY_NAME" - -echo -e "${GREEN}✓${NC} Installation successful!" - -# Check if installation directory is in PATH -if [[ ":$PATH:" != *":$INSTALL_DIR:"* ]]; then +# Check if .local/bin is in PATH +if [[ ":$PATH:" == *":$INSTALL_DIR:"* ]]; then + echo -e "${GREEN}✓${NC} .local/bin is already in your PATH." +else echo -e "${YELLOW}⚠${NC} The installation directory is not in your PATH." echo "Please add the following line to your shell profile:" echo " export PATH=\"\$PATH:$INSTALL_DIR\"" echo "" echo "Then restart your shell or run:" echo " source ~/.bashrc # or your appropriate shell config file" -else - echo -e "${GREEN}✓${NC} The CLI tool is now available in your PATH." fi echo ""