Add AGENTS.md with instructions for using the installer creation guide when users request GitHub binary installers

AGENTS.md

@@ -0,0 +1,44 @@
+# Agent Instructions for GitHub Binary Installers
+
+## When to Use the Installer Creation Guide
+
+When a user requests the creation of an installer script for a binary hosted on GitHub releases, follow these steps:
+
+1. **Check Existing Installers**: First, verify if an installer for the requested tool already exists in the repository by checking the project files.
+
+2. **Use the Guide**: If no installer exists, use the `INSTALLER_CREATION_GUIDE.md` as the primary reference for creating the new installer.
+
+3. **Follow the Template**: Strictly adhere to the structure, functions, and patterns outlined in the guide. Do not deviate from the established conventions.
+
+4. **Adapt Placeholders**: Replace all placeholders (`[tool]`, `[Tool Name]`, `[TOOL]`, `[owner]/[repo]`) with the actual values for the requested binary.
+
+5. **Verify GitHub Releases**: Ensure the binary naming convention and download URLs match the actual GitHub release assets.
+
+6. **Test the Script**: After creation, the script should be tested to ensure it works correctly on the target systems.
+
+7. **Update Documentation**: Add appropriate usage examples and next steps specific to the tool being installed.
+
+## Key Requirements
+
+- **System-Wide Preference**: Always prefer system-wide installation (`/usr/local/bin`) over user-specific installation.
+- **Binary-Only**: Disable package manager installation to ensure the latest version from GitHub is used.
+- **Version Management**: Implement proper version symlinks for multiple version support.
+- **Conflict Resolution**: Detect and offer to remove conflicting user bin installations.
+- **Command-Line Options**: Support `--version`, `--force`, and `--reinstall` options.
+- **Error Handling**: Include comprehensive error checking and user-friendly messages.
+
+## File Naming Convention
+
+Name the installer script as `install-[tool-name].sh` (e.g., `install-my-tool.sh`).
+
+## Integration
+
+After creating the installer:
+1. Add it to the repository
+2. Update any relevant README files to reference the new installer
+3. Ensure the script is executable (`chmod +x install-[tool-name].sh`)
+
+## Reference
+
+See `INSTALLER_CREATION_GUIDE.md` for complete implementation details and code templates.</content>
+<parameter name="filePath">AGENTS.md

INSTALLER_CREATION_GUIDE.md

@@ -0,0 +1,621 @@
+# GitHub Binary Installer Template
+
+This document provides instructions for creating a new installer script for binaries hosted on GitHub releases, following the patterns established in the git-credential-manager, borg-cli, and tea-cli installers.
+
+## Overview
+
+The installer should:
+- Prefer system-wide installation (/usr/local/bin) for all users
+- Fall back to user-specific installation ($HOME/bin) if no sudo access
+- Handle version management with symlinks
+- Warn about and offer to remove conflicting user bin installations
+- Support command-line options for version specification and reinstallation
+- Always use GitHub releases for the latest binaries (avoid package managers)
+
+## Script Structure
+
+### 1. Header and Configuration
+
+```bash
+#!/bin/bash
+
+# [Tool Name] Installer
+# Downloads and installs the latest [Tool Name] binary
+# Supports multiple platforms and installation methods
+
+set -e
+
+# Colors for output
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# Configuration
+GITHUB_REPO="[owner]/[repo]"  # e.g., "git-ecosystem/git-credential-manager"
+USER_BIN_DIR="$HOME/bin"
+SYSTEM_INSTALL_DIR="/usr/local/bin"
+TEMP_DIR="/tmp/[tool]-install"
+```
+
+### 2. Core Utility Functions
+
+```bash
+# Function to print colored output
+print_status() {
+    echo -e "${BLUE}[INFO]${NC} $1"
+}
+
+print_success() {
+    echo -e "${GREEN}[SUCCESS]${NC} $1"
+}
+
+print_warning() {
+    echo -e "${YELLOW}[WARNING]${NC} $1"
+}
+
+print_error() {
+    echo -e "${RED}[ERROR]${NC} $1"
+}
+
+# Function to check if command exists
+command_exists() {
+    command -v "$1" >/dev/null 2>&1
+}
+```
+
+### 3. System Detection Functions
+
+```bash
+# Function to detect OS and package manager
+detect_os() {
+    if [[ -f /etc/os-release ]]; then
+        . /etc/os-release
+        OS="$ID"
+        OS_VERSION="$VERSION_ID"
+    else
+        print_error "Cannot detect operating system"
+        exit 1
+    fi
+
+    # Detect package manager
+    if command_exists apt; then
+        PKG_MANAGER="apt"
+    elif command_exists yum; then
+        PKG_MANAGER="yum"
+    elif command_exists dnf; then
+        PKG_MANAGER="dnf"
+    elif command_exists pacman; then
+        PKG_MANAGER="pacman"
+    elif command_exists zypper; then
+        PKG_MANAGER="zypper"
+    else
+        PKG_MANAGER="unknown"
+    fi
+
+    print_status "Detected OS: $OS $OS_VERSION"
+    print_status "Package manager: $PKG_MANAGER"
+}
+
+# Function to get system architecture
+get_arch() {
+    ARCH=$(uname -m)
+    case $ARCH in
+        x86_64)
+            echo "amd64"
+            ;;
+        aarch64|arm64)
+            echo "arm64"
+            ;;
+        armv7l)
+            echo "arm"
+            ;;
+        *)
+            print_error "Unsupported architecture: $ARCH"
+            exit 1
+            ;;
+    esac
+}
+```
+
+### 4. Version Management Functions
+
+```bash
+# Function to get current installed version and location
+get_current_version() {
+    if command_exists [tool]; then
+        CURRENT_VERSION=$([tool] --version 2>/dev/null | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+' | head -n 1)
+        if [[ -z "$CURRENT_VERSION" ]]; then
+            CURRENT_VERSION="unknown"
+        fi
+
+        # Determine installation location
+        [TOOL]_PATH=$(which [tool])
+        if [[ "$[TOOL]_PATH" == "$USER_BIN_DIR"* ]]; then
+            INSTALL_TYPE="user"
+        elif [[ "$[TOOL]_PATH" == "/usr/local/bin"* ]] || [[ "$[TOOL]_PATH" == "/usr/bin"* ]]; then
+            INSTALL_TYPE="system"
+        else
+            INSTALL_TYPE="other"
+        fi
+    else
+        CURRENT_VERSION="not_installed"
+        INSTALL_TYPE="none"
+    fi
+    echo "$CURRENT_VERSION:$INSTALL_TYPE"
+}
+
+# Function to compare versions
+compare_versions() {
+    local version1="$1"
+    local version2="$2"
+
+    # Remove 'v' prefix if present
+    version1=${version1#v}
+    version2=${version2#v}
+
+    # Split versions into arrays
+    IFS='.' read -ra V1 <<< "$version1"
+    IFS='.' read -ra V2 <<< "$version2"
+
+    # Compare major, minor, patch
+    for i in {0..2}; do
+        local v1=${V1[$i]:-0}
+        local v2=${V2[$i]:-0}
+
+        if (( v1 > v2 )); then
+            return 0  # version1 > version2
+        elif (( v1 < v2 )); then
+            return 1  # version1 < version2
+        fi
+    done
+
+    return 0  # versions are equal
+}
+
+# Function to get latest release info
+get_latest_release() {
+    print_status "Fetching latest [Tool Name] release information..."
+
+    if command_exists curl; then
+        RELEASE_INFO=$(curl -s "https://api.github.com/repos/$GITHUB_REPO/releases/latest")
+    elif command_exists wget; then
+        RELEASE_INFO=$(wget -qO- "https://api.github.com/repos/$GITHUB_REPO/releases/latest")
+    else
+        print_error "curl or wget is required"
+        exit 1
+    fi
+
+    if [[ -z "$RELEASE_INFO" ]]; then
+        print_error "Failed to fetch release information"
+        exit 1
+    fi
+
+    # Extract version and download URLs
+    LATEST_VERSION=$(echo "$RELEASE_INFO" | grep -o '"tag_name": *"[^"]*"' | sed -E 's/.*"([^"]+)".*/\1/')
+
+    if [[ -z "$LATEST_VERSION" ]]; then
+        print_error "Failed to parse release information"
+        exit 1
+    fi
+
+    print_success "Latest version: $LATEST_VERSION"
+}
+
+# Function to check if update is needed
+check_update_needed() {
+    local latest_version="$1"
+    local current_info=$(get_current_version)
+    local current_version=$(echo "$current_info" | cut -d: -f1)
+    local install_type=$(echo "$current_info" | cut -d: -f2)
+
+    print_status "Current version: $current_version ($install_type)"
+    print_status "Latest version: $latest_version"
+
+    if [[ "$current_version" == "not_installed" ]]; then
+        print_status "[Tool Name] is not installed"
+        return 0  # Need to install
+    fi
+
+    if [[ "$current_version" == "unknown" ]]; then
+        print_warning "Cannot determine current version, proceeding with update"
+        return 0  # Assume update needed
+    fi
+
+    # Clean version strings for comparison
+    local clean_current="${current_version#v}"
+    local clean_latest="${latest_version#v}"
+
+    if compare_versions "$clean_latest" "$clean_current"; then
+        if [[ "$clean_latest" == "$clean_current" ]]; then
+            print_success "You already have the latest version ($current_version) installed at $install_type location"
+            if [[ "$force_reinstall" == "true" ]]; then
+                print_status "Force reinstall requested, proceeding..."
+                return 0
+            else
+                return 1  # No update needed
+            fi
+        else
+            print_status "Newer version available: $latest_version > $current_version"
+            return 0  # Update needed
+        fi
+    else
+        print_success "Your version ($current_version) is newer than latest release ($latest_version)"
+        return 1  # No update needed
+    fi
+}
+```
+
+### 5. Installation Strategy Functions
+
+```bash
+# Function to check if user bin directory exists and is in PATH
+check_user_bin_setup() {
+    if [[ ! -d "$USER_BIN_DIR" ]]; then
+        print_status "User bin directory doesn't exist"
+        return 1
+    fi
+
+    # Check if user bin is in PATH
+    if [[ ":$PATH:" != *":$USER_BIN_DIR:"* ]]; then
+        print_warning "User bin directory ($USER_BIN_DIR) is not in PATH"
+        print_status "Add to PATH: export PATH=\"$USER_BIN_DIR:\$PATH\""
+        return 1
+    fi
+
+    return 0
+}
+
+# Function to check for version-specific symlink
+check_version_symlink() {
+    local [tool]_path=$(which [tool] 2>/dev/null)
+    if [[ -z "$[tool]_path" ]]; then
+        return 1
+    fi
+
+    # Check if it's a symlink
+    if [[ -L "$[tool]_path" ]]; then
+        SYMLINK_TARGET=$(readlink "$[tool]_path")
+        # Extract version from symlink target
+        if [[ "$SYMLINK_TARGET" =~ [tool]-([0-9]+\.[0-9]+\.[0-9]+) ]]; then
+            CURRENT_SYMLINK_VERSION="${BASH_REMATCH[1]}"
+            return 0
+        fi
+    fi
+
+    return 1
+}
+
+# Function to determine installation strategy
+determine_install_strategy() {
+    local current_info=$(get_current_version)
+    local current_version=$(echo "$current_info" | cut -d: -f1)
+    local install_type=$(echo "$current_info" | cut -d: -f2)
+
+    # Strategy: Prefer system installation for all users
+    if [[ $EUID -eq 0 ]] || sudo -n true 2>/dev/null; then
+        print_status "Installing system-wide for all users"
+        INSTALL_STRATEGY="system_install"
+        TARGET_DIR="$SYSTEM_INSTALL_DIR"
+
+        # Warn if user bin has [tool]
+        if [[ -f "$USER_BIN_DIR/[tool]" ]]; then
+            print_warning "[Tool Name] found in user bin directory ($USER_BIN_DIR)"
+            print_status "This might take precedence if $USER_BIN_DIR is in PATH before system paths"
+        fi
+    else
+        print_status "No sudo access, checking user bin directory"
+        if check_user_bin_setup; then
+            print_status "User bin directory is available and in PATH"
+
+            # Check if [tool] exists in user bin
+            if [[ -f "$USER_BIN_DIR/[tool]" ]]; then
+                print_status "[Tool Name] found in user bin directory"
+
+                # Check for version symlink
+                if check_version_symlink; then
+                    print_status "Version symlink found: $CURRENT_SYMLINK_VERSION"
+                    INSTALL_STRATEGY="user_update"
+                    TARGET_DIR="$USER_BIN_DIR"
+                else
+                    print_status "No version symlink found, will create one"
+                    INSTALL_STRATEGY="user_upgrade"
+                    TARGET_DIR="$USER_BIN_DIR"
+                fi
+            else
+                print_status "[Tool Name] not found in user bin, will install there"
+                INSTALL_STRATEGY="user_install"
+                TARGET_DIR="$USER_BIN_DIR"
+            fi
+        else
+            print_error "Cannot install system-wide (no sudo) and user bin not available"
+            exit 1
+        fi
+    fi
+
+    print_status "Installation strategy: $INSTALL_STRATEGY"
+    print_status "Target directory: $TARGET_DIR"
+}
+```
+
+### 6. Download and Installation Functions
+
+```bash
+# Function to download file
+download_file() {
+    local url="$1"
+    local filename="$2"
+
+    print_status "Downloading $filename..."
+
+    if command_exists curl; then
+        curl -L -o "$TEMP_DIR/$filename" "$url"
+    elif command_exists wget; then
+        wget -O "$TEMP_DIR/$filename" "$url"
+    else
+        print_error "curl or wget is required"
+        exit 1
+    fi
+
+    if [[ ! -f "$TEMP_DIR/$filename" ]]; then
+        print_error "Failed to download $filename"
+        exit 1
+    fi
+
+    print_success "Downloaded $filename"
+}
+
+# Function to install [Tool Name] from binary
+install_[tool]_from_binary() {
+    local arch="$1"
+    local version="$2"
+
+    # Determine binary name pattern from GitHub releases
+    local binary_name="[tool]-${version#v}-linux-${arch}"
+
+    local download_url="https://github.com/$GITHUB_REPO/releases/download/$version/$binary_name"
+
+    download_file "$download_url" "$binary_name"
+
+    # Determine installation command based on target directory
+    local install_cmd="install -m 755"
+    local symlink_cmd="ln -sf"
+
+    if [[ "$TARGET_DIR" == "$SYSTEM_INSTALL_DIR" ]]; then
+        install_cmd="sudo $install_cmd"
+        symlink_cmd="sudo $symlink_cmd"
+    fi
+
+    print_status "Installing [Tool Name] binary to $TARGET_DIR..."
+
+    # Install the binary with version suffix
+    $install_cmd "$TEMP_DIR/$binary_name" "$TARGET_DIR/[tool]-$version"
+
+    # Verify installation
+    if [[ ! -f "$TARGET_DIR/[tool]-$version" ]]; then
+        print_error "Failed to install [Tool Name] binary"
+        return 1
+    fi
+
+    # Remove any existing [tool] symlink or file to avoid conflicts
+    rm -f "$TARGET_DIR/[tool]"
+
+    # Create/update symlink to point to this version
+    $symlink_cmd "$TARGET_DIR/[tool]-$version" "$TARGET_DIR/[tool]"
+
+    print_success "[Tool Name] binary installed successfully"
+    print_status "Version symlink: [tool] -> [tool]-$version"
+}
+
+# Function to verify [Tool Name] installation
+verify_[tool]_installation() {
+    print_status "Verifying [Tool Name] installation..."
+
+    if command_exists [tool]; then
+        local version=$([tool] --version 2>/dev/null | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+' | head -n 1)
+        print_success "[Tool Name] installed: $version"
+
+        # Check for user bin versions and offer removal
+        if [[ -d "$USER_BIN_DIR" ]] && [[ "$TARGET_DIR" == "$SYSTEM_INSTALL_DIR" ]]; then
+            local user_versions=()
+            for file in "$USER_BIN_DIR"/[tool]*; do
+                if [[ -f "$file" ]]; then
+                    user_versions+=("$file")
+                fi
+            done
+
+            if [[ ${#user_versions[@]} -gt 0 ]]; then
+                print_warning "Found [tool] binaries in user bin directory:"
+                for file in "${user_versions[@]}"; do
+                    echo "  $file"
+                done
+                echo
+                read -p "Would you like to remove these user bin versions? (y/N): " -n 1 -r
+                echo
+                if [[ $REPLY =~ ^[Yy]$ ]]; then
+                    for file in "${user_versions[@]}"; do
+                        rm -f "$file"
+                        print_status "Removed $file"
+                    done
+                    print_success "Removed all user bin versions"
+                fi
+            fi
+        fi
+
+        return 0
+    else
+        print_error "[Tool Name] installation verification failed"
+        return 1
+    fi
+}
+```
+
+### 7. Utility Functions
+
+```bash
+# Function to cleanup
+cleanup() {
+    if [[ -d "$TEMP_DIR" ]]; then
+        rm -rf "$TEMP_DIR"
+        print_status "Cleaned up temporary files"
+    fi
+}
+
+# Function to show usage
+show_usage() {
+    echo "[Tool Name] Installer"
+    echo
+    echo "Usage: $0 [OPTIONS]"
+    echo
+    echo "Options:"
+    echo "  -h, --help     Show this help message"
+    echo "  -v, --version  Install specific version (default: latest)"
+    echo "  -f, --force    Force reinstall even if up-to-date"
+    echo "  -r, --reinstall Reinstall the current installed version"
+    echo
+    echo "Examples:"
+    echo "  $0                    # Install latest version using best method"
+    echo "  $0 -v v1.0.0          # Install specific version"
+    echo "  $0 --reinstall        # Reinstall current version"
+}
+```
+
+### 8. Main Function
+
+```bash
+# Main installation function
+main() {
+    local target_version=""
+    local force_reinstall=false
+    local reinstall_current=false
+
+    # Parse command line arguments
+    while [[ $# -gt 0 ]]; do
+        case $1 in
+            -h|--help)
+                show_usage
+                exit 0
+                ;;
+            -v|--version)
+                target_version="$2"
+                shift 2
+                ;;
+            -f|--force)
+                force_reinstall=true
+                shift
+                ;;
+            -r|--reinstall)
+                reinstall_current=true
+                shift
+                ;;
+            *)
+                print_error "Unknown option: $1"
+                show_usage
+                exit 1
+                ;;
+        esac
+    done
+
+    echo "========================================"
+    echo "[Tool Name] Installer"
+    echo "========================================"
+    echo
+
+    # Check if running as root for system installation
+    if [[ $EUID -ne 0 ]]; then
+        print_warning "Not running as root. Some operations may require sudo."
+    fi
+
+    # Detect system
+    detect_os
+    ARCH=$(get_arch)
+
+    # Handle reinstall current version
+    if [[ "$reinstall_current" == "true" ]]; then
+        local current_info=$(get_current_version)
+        local current_version=$(echo "$current_info" | cut -d: -f1)
+        if [[ "$current_version" == "not_installed" ]]; then
+            print_error "No current version installed to reinstall"
+            exit 1
+        fi
+        target_version="$current_version"
+        force_reinstall=true
+        print_status "Reinstalling current version: $target_version"
+    fi
+
+    # Get latest version if not specified
+    if [[ -z "$target_version" ]]; then
+        get_latest_release
+        target_version="$LATEST_VERSION"
+    else
+        print_status "Using specified version: $target_version"
+    fi
+
+    # Determine installation strategy
+    determine_install_strategy
+
+    # Check if update is needed
+    if ! check_update_needed "$target_version"; then
+        print_success "No installation needed. Exiting."
+        exit 0
+    fi
+
+    # Create temporary directory
+    mkdir -p "$TEMP_DIR"
+
+    # Trap cleanup on exit
+    trap cleanup EXIT
+
+    # Install from binary
+    install_[tool]_from_binary "$ARCH" "$target_version"
+    verify_[tool]_installation
+
+    # Installation completed successfully
+    echo
+    print_success "Installation completed successfully!"
+    echo
+    echo "Installation details:"
+    echo "- Strategy: $INSTALL_STRATEGY"
+    echo "- Location: $TARGET_DIR"
+    if [[ "$INSTALL_STRATEGY" == user* ]]; then
+        echo "- Binary: [tool] (symlink to [tool]-$target_version)"
+        echo "- Version: $target_version"
+    fi
+    echo
+    echo "Next steps:"
+    echo "1. Test installation: [tool] --version"
+    echo "2. [Add tool-specific usage instructions]"
+    echo
+    if [[ "$INSTALL_STRATEGY" == user* ]]; then
+        echo "User-specific installation notes:"
+        echo "- Binary installed in: $USER_BIN_DIR"
+        echo "- Ensure $USER_BIN_DIR is in your PATH"
+        echo "- You can have multiple versions side-by-side"
+    fi
+    echo
+    echo "For more information, visit: https://github.com/$GITHUB_REPO"
+}
+
+# Run main function
+main "$@"
+```
+
+## Implementation Notes
+
+1. **Replace Placeholders**: Replace `[tool]`, `[Tool Name]`, `[TOOL]`, `[owner]/[repo]` with actual values.
+
+2. **Binary Naming Convention**: Adjust the `binary_name` in `install_[tool]_from_binary` to match the actual GitHub release asset names.
+
+3. **Version Detection**: Modify the version extraction in `get_current_version` and `verify_[tool]_installation` to match the tool's `--version` output format.
+
+4. **Package Manager**: Since we disable package manager installation, the script will always use the binary method.
+
+5. **Testing**: Test the script on different systems and with different scenarios (system vs user installation, reinstall, etc.).
+
+6. **Error Handling**: Ensure all error conditions are properly handled with appropriate exit codes.
+
+7. **Documentation**: Update the usage examples and next steps section with tool-specific information.
+
+This template ensures consistency across all installer scripts and provides a robust installation experience for users.</content>
+<parameter name="filePath">INSTALLER_CREATION_GUIDE.md

install-borg-cli.sh

@@ -198,7 +198,7 @@ check_update_needed() {
 
     if compare_versions "$clean_latest" "$clean_current"; then
         if [[ "$clean_latest" == "$clean_current" ]]; then
-            print_success "You already have the latest version ($current_version)"
+            print_success "You already have the latest version ($current_version) installed at $install_type location"
             if [[ "$force_reinstall" == "true" ]]; then
                 print_status "Force reinstall requested, proceeding..."
                 return 0
@@ -282,33 +282,45 @@ determine_install_strategy() {
     local current_version=$(echo "$current_info" | cut -d: -f1)
     local install_type=$(echo "$current_info" | cut -d: -f2)
 
-    # Strategy 1: Check user bin directory first
+    # Strategy: Prefer system installation for all users
-    if check_user_bin_setup; then
+    if [[ $EUID -eq 0 ]] || sudo -n true 2>/dev/null; then
-        print_status "User bin directory is available and in PATH"
+        print_status "Installing system-wide for all users"
+        INSTALL_STRATEGY="system_install"
+        TARGET_DIR="$SYSTEM_INSTALL_DIR"
 
-        # Check if borg exists in user bin
+        # Warn if user bin has borg
         if [[ -f "$USER_BIN_DIR/borg" ]]; then
-            print_status "Borg CLI found in user bin directory"
+            print_warning "Borg CLI found in user bin directory ($USER_BIN_DIR)"
+            print_status "This might take precedence if $USER_BIN_DIR is in PATH before system paths"
+        fi
+    else
+        print_status "No sudo access, checking user bin directory"
+        if check_user_bin_setup; then
+            print_status "User bin directory is available and in PATH"
 
-            # Check for version symlink
+            # Check if borg exists in user bin
-            if check_version_symlink; then
+            if [[ -f "$USER_BIN_DIR/borg" ]]; then
-                print_status "Version symlink found: $CURRENT_SYMLINK_VERSION"
+                print_status "Borg CLI found in user bin directory"
-                INSTALL_STRATEGY="user_update"
+
-                TARGET_DIR="$USER_BIN_DIR"
+                # Check for version symlink
+                if check_version_symlink; then
+                    print_status "Version symlink found: $CURRENT_SYMLINK_VERSION"
+                    INSTALL_STRATEGY="user_update"
+                    TARGET_DIR="$USER_BIN_DIR"
+                else
+                    print_status "No version symlink found, will create one"
+                    INSTALL_STRATEGY="user_upgrade"
+                    TARGET_DIR="$USER_BIN_DIR"
+                fi
             else
-                print_status "No version symlink found, will create one"
+                print_status "Borg CLI not found in user bin, will install there"
-                INSTALL_STRATEGY="user_upgrade"
+                INSTALL_STRATEGY="user_install"
                 TARGET_DIR="$USER_BIN_DIR"
             fi
         else
-            print_status "Borg CLI not found in user bin, will install there"
+            print_error "Cannot install system-wide (no sudo) and user bin not available"
-            INSTALL_STRATEGY="user_install"
+            exit 1
-            TARGET_DIR="$USER_BIN_DIR"
         fi
-    else
-        print_status "User bin directory not available, using system installation"
-        INSTALL_STRATEGY="system_install"
-        TARGET_DIR="$SYSTEM_INSTALL_DIR"
     fi
 
     print_status "Installation strategy: $INSTALL_STRATEGY"
@@ -317,75 +329,9 @@ determine_install_strategy() {
 
 # Function to install Borg CLI from package manager
 install_borg_from_package_manager() {
-    # Package manager installation only works for system-wide installation
+    # Package manager versions are often outdated, use binary from GitHub instead
-    if [[ "$INSTALL_STRATEGY" == user* ]]; then
+    print_warning "Package manager installation skipped for Borg CLI to ensure latest version, using binary instead"
-        print_status "Skipping package manager for user installation"
+    return 1
-        return 1
-    fi
-
-    print_status "Attempting to install Borg CLI from package manager..."
-
-    case $PKG_MANAGER in
-        apt)
-            # Check if Borg CLI is available in official repositories
-            if apt-cache show borgbackup 2>/dev/null | grep -q "borg"; then
-                print_status "Installing Borg CLI from Ubuntu/Debian repositories..."
-                sudo apt install -y borgbackup
-                return 0
-            else
-                print_warning "Borg CLI not available in Ubuntu/Debian repositories"
-                return 1
-            fi
-            ;;
-        yum)
-            # Check if Borg CLI is available
-            if yum list available borgbackup 2>/dev/null | grep -q borgbackup; then
-                print_status "Installing Borg CLI from yum repositories..."
-                sudo yum install -y borgbackup
-                return 0
-            else
-                print_warning "Borg CLI not available in yum repositories"
-                return 1
-            fi
-            ;;
-        dnf)
-            # Check if Borg CLI is available
-            if dnf list available borgbackup 2>/dev/null | grep -q borgbackup; then
-                print_status "Installing Borg CLI from dnf repositories..."
-                sudo dnf install -y borgbackup
-                return 0
-            else
-                print_warning "Borg CLI not available in dnf repositories"
-                return 1
-            fi
-            ;;
-        pacman)
-            # Borg is available in Arch repositories
-            if pacman -Si borg 2>/dev/null | grep -q borg; then
-                print_status "Installing Borg CLI from pacman repositories..."
-                sudo pacman -S --noconfirm borg
-                return 0
-            else
-                print_warning "Borg CLI not available in pacman repositories"
-                return 1
-            fi
-            ;;
-        zypper)
-            # Check if Borg CLI is available
-            if zypper search -x borgbackup 2>/dev/null | grep -q borgbackup; then
-                print_status "Installing Borg CLI from zypper repositories..."
-                sudo zypper install -y borgbackup
-                return 0
-            else
-                print_warning "Borg CLI not available in zypper repositories"
-                return 1
-            fi
-            ;;
-        *)
-            print_warning "Package manager $PKG_MANAGER not supported for automatic installation"
-            return 1
-            ;;
-    esac
 }
 
 # Function to install Borg CLI from binary
@@ -413,6 +359,15 @@ install_borg_from_binary() {
     # Install the binary with version suffix
     $install_cmd "$TEMP_DIR/$binary_name" "$TARGET_DIR/borg-$version"
 
+    # Verify installation
+    if [[ ! -f "$TARGET_DIR/borg-$version" ]]; then
+        print_error "Failed to install Borg CLI binary"
+        return 1
+    fi
+
+    # Remove any existing borg symlink or file to avoid conflicts
+    rm -f "$TARGET_DIR/borg"
+
     # Create/update symlink to point to this version
     $symlink_cmd "$TARGET_DIR/borg-$version" "$TARGET_DIR/borg"
 
@@ -427,6 +382,34 @@ verify_borg_installation() {
     if command_exists borg; then
         local version=$(borg --version 2>/dev/null | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+' | head -n 1)
         print_success "Borg CLI installed: $version"
+
+        # Check for user bin versions and offer removal
+        if [[ -d "$USER_BIN_DIR" ]] && [[ "$TARGET_DIR" == "$SYSTEM_INSTALL_DIR" ]]; then
+            local user_versions=()
+            for file in "$USER_BIN_DIR"/borg*; do
+                if [[ -f "$file" ]]; then
+                    user_versions+=("$file")
+                fi
+            done
+
+            if [[ ${#user_versions[@]} -gt 0 ]]; then
+                print_warning "Found borg binaries in user bin directory:"
+                for file in "${user_versions[@]}"; do
+                    echo "  $file"
+                done
+                echo
+                read -p "Would you like to remove these user bin versions? (y/N): " -n 1 -r
+                echo
+                if [[ $REPLY =~ ^[Yy]$ ]]; then
+                    for file in "${user_versions[@]}"; do
+                        rm -f "$file"
+                        print_status "Removed $file"
+                    done
+                    print_success "Removed all user bin versions"
+                fi
+            fi
+        fi
+
         return 0
     else
         print_error "Borg CLI installation verification failed"
@@ -452,12 +435,14 @@ show_usage() {
     echo "  -h, --help     Show this help message"
     echo "  -v, --version  Install specific version (default: latest)"
     echo "  -f, --force    Force reinstall even if up-to-date"
+    echo "  -r, --reinstall Reinstall the current installed version"
     echo "  -p, --package  Force installation from package manager"
     echo "  -b, --binary   Force installation from binary"
     echo
     echo "Examples:"
     echo "  $0                    # Install latest version using best method"
     echo "  $0 -v v1.2.7          # Install specific version"
+    echo "  $0 --reinstall        # Reinstall current version"
     echo "  $0 --package          # Force installation from package manager"
     echo "  $0 --binary           # Force installation from binary"
     echo
@@ -467,6 +452,7 @@ show_usage() {
 main() {
     local target_version=""
     local force_reinstall=false
+    local reinstall_current=false
     local install_method="auto"
 
     # Parse command line arguments
@@ -484,6 +470,10 @@ main() {
                 force_reinstall=true
                 shift
                 ;;
+            -r|--reinstall)
+                reinstall_current=true
+                shift
+                ;;
             -p|--package)
                 install_method="package"
                 shift
@@ -514,6 +504,19 @@ main() {
     detect_os
     ARCH=$(get_arch)
 
+    # Handle reinstall current version
+    if [[ "$reinstall_current" == "true" ]]; then
+        local current_info=$(get_current_version)
+        local current_version=$(echo "$current_info" | cut -d: -f1)
+        if [[ "$current_version" == "not_installed" ]]; then
+            print_error "No current version installed to reinstall"
+            exit 1
+        fi
+        target_version="$current_version"
+        force_reinstall=true
+        print_status "Reinstalling current version: $target_version"
+    fi
+
     # Get latest version if not specified
     if [[ -z "$target_version" ]]; then
         get_latest_release

install-git-credential-manager.sh

@@ -16,6 +16,7 @@ NC='\033[0m' # No Color
 # Configuration
 GITHUB_REPO="git-ecosystem/git-credential-manager"
 INSTALL_DIR="/usr/local/bin"
+USER_BIN_DIR="$HOME/bin"
 TEMP_DIR="/tmp/gcm-install"
 
 # Function to print colored output
@@ -90,7 +91,7 @@ get_arch() {
     esac
 }
 
-# Function to get current installed version
+# Function to get current installed version and location
 get_current_version() {
     if command_exists git-credential-manager; then
         # Extract version from output like "2.6.1+786ab03440ddc82e807a97c0e540f5247e44cec6"
@@ -101,10 +102,21 @@ get_current_version() {
         else
             CURRENT_VERSION="unknown"
         fi
+
+        # Determine installation location
+        GCM_PATH=$(which git-credential-manager)
+        if [[ "$GCM_PATH" == "$HOME/bin"* ]]; then
+            INSTALL_TYPE="user"
+        elif [[ "$GCM_PATH" == "/usr/local/bin"* ]] || [[ "$GCM_PATH" == "/usr/bin"* ]]; then
+            INSTALL_TYPE="system"
+        else
+            INSTALL_TYPE="other"
+        fi
     else
         CURRENT_VERSION="not_installed"
+        INSTALL_TYPE="none"
     fi
-    echo "$CURRENT_VERSION"
+    echo "$CURRENT_VERSION:$INSTALL_TYPE"
 }
 
 # Function to compare versions (returns 0 if first >= second, 1 if first < second)
@@ -166,25 +178,27 @@ get_latest_release() {
 
 # Function to check if update is needed
 check_update_needed() {
-    local current_version=$(get_current_version)
+    local current_info=$(get_current_version)
+    local current_version=$(echo "$current_info" | cut -d: -f1)
+    local install_type=$(echo "$current_info" | cut -d: -f2)
     local latest_version="$1"
-    
+
-    print_status "Current version: $current_version"
+    print_status "Current version: $current_version ($install_type)"
     print_status "Latest version: $latest_version"
-    
+
     if [[ "$current_version" == "not_installed" ]]; then
         print_status "git-credential-manager is not installed"
         return 0  # Need to install
     fi
-    
+
     if [[ "$current_version" == "unknown" ]]; then
         print_warning "Cannot determine current version, proceeding with update"
         return 0  # Assume update needed
     fi
-    
+
     if compare_versions "$latest_version" "$current_version"; then
         if [[ "$latest_version" == "$current_version" ]]; then
-            print_success "You already have the latest version ($current_version)"
+            print_success "You already have the latest version ($current_version) installed at $install_type location"
             if [[ "$force_reinstall" == "true" ]]; then
                 print_status "Force reinstall requested, proceeding..."
                 return 0
@@ -327,9 +341,16 @@ install_from_tarball() {
         cd "$extracted_dir"
         print_status "Installing binary to $INSTALL_DIR..."
         sudo install -m 755 git-credential-manager "$INSTALL_DIR/git-credential-manager"
+
+        # Verify installation
+        if [[ ! -f "$INSTALL_DIR/git-credential-manager" ]]; then
+            print_error "Failed to install Git Credential Manager binary"
+            return 1
+        fi
+
         sudo ln -sf "$INSTALL_DIR/git-credential-manager" "$INSTALL_DIR/git-credential-manager-core"
     fi
-    
+
     print_success "Binary installed successfully"
 }
 
@@ -451,6 +472,19 @@ verify_installation() {
         # Check all presets
         configure_git_presets
 
+        # Check for user bin version and offer removal
+        if [[ -f "$USER_BIN_DIR/git-credential-manager" ]]; then
+            print_warning "Found git-credential-manager in user bin directory ($USER_BIN_DIR)"
+            print_status "This might take precedence if $USER_BIN_DIR is in PATH before system paths"
+            echo
+            read -p "Would you like to remove the user bin version? (y/N): " -n 1 -r
+            echo
+            if [[ $REPLY =~ ^[Yy]$ ]]; then
+                rm -f "$USER_BIN_DIR/git-credential-manager"
+                print_success "Removed user bin version"
+            fi
+        fi
+
         return 0
     else
         print_error "git-credential-manager installation verification failed"
@@ -476,6 +510,7 @@ show_usage() {
     echo "  -h, --help     Show this help message"
     echo "  -v, --version  Install specific version (default: latest)"
     echo "  -f, --force    Force reinstall even if already installed"
+    echo "  -r, --reinstall Reinstall the current installed version"
     echo "  -p, --package  Force installation from package manager"
     echo "  -d, --deb      Force installation from DEB package"
     echo "  -t, --tarball  Force installation from tarball"
@@ -484,6 +519,7 @@ show_usage() {
     echo "Examples:"
     echo "  $0                    # Install latest version using best method"
     echo "  $0 -v v2.6.0         # Install specific version"
+    echo "  $0 --reinstall        # Reinstall current version"
     echo "  $0 --package          # Force installation from package manager"
     echo "  $0 --deb             # Force installation from DEB package"
     echo "  $0 --checks           # Check configuration without installing"
@@ -519,6 +555,7 @@ run_checks_only() {
 main() {
     local target_version=""
     local force_reinstall=false
+    local reinstall_current=false
     local install_method="auto"
     local checks_only=false
 
@@ -537,6 +574,10 @@ main() {
                 force_reinstall=true
                 shift
                 ;;
+            -r|--reinstall)
+                reinstall_current=true
+                shift
+                ;;
             -p|--package)
                 install_method="package"
                 shift
@@ -566,12 +607,25 @@ main() {
         run_checks_only
         exit 0
     fi
-    
+
     echo "========================================"
     echo "Git Credential Manager Installer"
     echo "========================================"
     echo
-    
+
+    # Handle reinstall current version
+    if [[ "$reinstall_current" == "true" ]]; then
+        local current_info=$(get_current_version)
+        local current_version=$(echo "$current_info" | cut -d: -f1)
+        if [[ "$current_version" == "not_installed" ]]; then
+            print_error "No current version installed to reinstall"
+            exit 1
+        fi
+        target_version="$current_version"
+        force_reinstall=true
+        print_status "Reinstalling current version: $target_version"
+    fi
+
     # Get latest version if not specified
     if [[ -z "$target_version" ]]; then
         get_latest_release

install-tea-cli.sh

@@ -158,33 +158,45 @@ determine_install_strategy() {
     local current_version=$(echo "$current_info" | cut -d: -f1)
     local install_type=$(echo "$current_info" | cut -d: -f2)
 
-    # Strategy 1: Check user bin directory first
+    # Strategy: Prefer system installation for all users
-    if check_user_bin_setup; then
+    if [[ $EUID -eq 0 ]] || sudo -n true 2>/dev/null; then
-        print_status "User bin directory is available and in PATH"
+        print_status "Installing system-wide for all users"
+        INSTALL_STRATEGY="system_install"
+        TARGET_DIR="$SYSTEM_INSTALL_DIR"
 
-        # Check if tea exists in user bin
+        # Warn if user bin has tea
         if [[ -f "$USER_BIN_DIR/tea" ]]; then
-            print_status "Tea CLI found in user bin directory"
+            print_warning "Tea CLI found in user bin directory ($USER_BIN_DIR)"
+            print_status "This might take precedence if $USER_BIN_DIR is in PATH before system paths"
+        fi
+    else
+        print_status "No sudo access, checking user bin directory"
+        if check_user_bin_setup; then
+            print_status "User bin directory is available and in PATH"
 
-            # Check for version symlink
+            # Check if tea exists in user bin
-            if check_version_symlink; then
+            if [[ -f "$USER_BIN_DIR/tea" ]]; then
-                print_status "Version symlink found: $CURRENT_SYMLINK_VERSION"
+                print_status "Tea CLI found in user bin directory"
-                INSTALL_STRATEGY="user_update"
+
-                TARGET_DIR="$USER_BIN_DIR"
+                # Check for version symlink
+                if check_version_symlink; then
+                    print_status "Version symlink found: $CURRENT_SYMLINK_VERSION"
+                    INSTALL_STRATEGY="user_update"
+                    TARGET_DIR="$USER_BIN_DIR"
+                else
+                    print_status "No version symlink found, will create one"
+                    INSTALL_STRATEGY="user_upgrade"
+                    TARGET_DIR="$USER_BIN_DIR"
+                fi
             else
-                print_status "No version symlink found, will create one"
+                print_status "Tea CLI not found in user bin, will install there"
-                INSTALL_STRATEGY="user_upgrade"
+                INSTALL_STRATEGY="user_install"
                 TARGET_DIR="$USER_BIN_DIR"
             fi
         else
-            print_status "Tea CLI not found in user bin, will install there"
+            print_error "Cannot install system-wide (no sudo) and user bin not available"
-            INSTALL_STRATEGY="user_install"
+            exit 1
-            TARGET_DIR="$USER_BIN_DIR"
         fi
-    else
-        print_status "User bin directory not available, using system installation"
-        INSTALL_STRATEGY="system_install"
-        TARGET_DIR="$SYSTEM_INSTALL_DIR"
     fi
 
     print_status "Installation strategy: $INSTALL_STRATEGY"
@@ -274,7 +286,7 @@ check_update_needed() {
 
     if compare_versions "$clean_latest" "$clean_current"; then
         if [[ "$clean_latest" == "$clean_current" ]]; then
-            print_success "You already have the latest version ($current_version)"
+            print_success "You already have the latest version ($current_version) installed at $install_type location"
             if [[ "$force_reinstall" == "true" ]]; then
                 print_status "Force reinstall requested, proceeding..."
                 return 0
@@ -317,60 +329,9 @@ download_file() {
 
 # Function to install Tea CLI from package manager
 install_tea_from_package_manager() {
-    # Package manager installation only works for system-wide installation
+    # Package manager installation is not reliable for Tea CLI, use binary instead
-    if [[ "$INSTALL_STRATEGY" == user* ]]; then
+    print_warning "Package manager installation not supported for Tea CLI to ensure correct version, using binary instead"
-        print_status "Skipping package manager for user installation"
+    return 1
-        return 1
-    fi
-
-    print_status "Attempting to install Tea CLI from package manager..."
-
-    case $PKG_MANAGER in
-        apt)
-            # Add Gitea repository if not present
-            if ! grep -q "https://dl.gitea.com/gitea/gpg.key" /etc/apt/sources.list /etc/apt/sources.list.d/*.list 2>/dev/null; then
-                print_status "Adding Gitea repository..."
-                curl -fsSL https://dl.gitea.com/gitea/gpg.key | sudo apt-key add -
-                echo "deb https://dl.gitea.com/gitea/ gitea main" | sudo tee /etc/apt/sources.list.d/gitea.list
-                sudo apt update
-            fi
-
-            sudo apt install -y tea
-            return 0
-            ;;
-        yum)
-            # Add Gitea repository
-            print_status "Adding Gitea repository..."
-            sudo yum-config-manager --add-repo https://dl.gitea.com/gitea/RPM/GPG.KEY
-            sudo yum-config-manager --add-repo https://dl.gitea.com/gitea/yum/ gitea
-            sudo yum install -y tea
-            return 0
-            ;;
-        dnf)
-            # Add Gitea repository
-            print_status "Adding Gitea repository..."
-            sudo dnf config-manager --add-repo https://dl.gitea.com/gitea/RPM/GPG.KEY
-            sudo dnf config-manager --add-repo https://dl.gitea.com/gitea/yum/ gitea
-            sudo dnf install -y tea
-            return 0
-            ;;
-        pacman)
-            # Tea CLI is in AUR
-            print_warning "Tea CLI is available in AUR. Consider using 'yay -S tea' or 'pacaur -S tea'"
-            return 1
-            ;;
-        zypper)
-            print_status "Adding Gitea repository..."
-            sudo zypper addrepo -G https://dl.gitea.com/gitea/RPM/GPG.KEY
-            sudo zypper addrepo https://dl.gitea.com/gitea/yum/ gitea
-            sudo zypper install -y tea
-            return 0
-            ;;
-        *)
-            print_warning "Package manager $PKG_MANAGER not supported for automatic installation"
-            return 1
-            ;;
-    esac
 }
 
 # Function to install Tea CLI from binary
@@ -397,6 +358,15 @@ install_tea_from_binary() {
     # Install the binary with version suffix
     $install_cmd "$TEMP_DIR/$binary_name" "$TARGET_DIR/tea-$version"
 
+    # Verify installation
+    if [[ ! -f "$TARGET_DIR/tea-$version" ]]; then
+        print_error "Failed to install Tea CLI binary"
+        return 1
+    fi
+
+    # Remove any existing tea symlink or file to avoid conflicts
+    rm -f "$TARGET_DIR/tea"
+
     # Create/update symlink to point to this version
     $symlink_cmd "$TARGET_DIR/tea-$version" "$TARGET_DIR/tea"
 
@@ -407,10 +377,38 @@ install_tea_from_binary() {
 # Function to verify Tea CLI installation
 verify_tea_installation() {
     print_status "Verifying Tea CLI installation..."
-    
+
     if command_exists tea; then
         local version=$(tea --version 2>/dev/null | grep -o '[0-9]\+\.[0-9]\+\.[0-9]\+' | head -n 1)
         print_success "Tea CLI installed: $version"
+
+        # Check for user bin versions and offer removal
+        if [[ -d "$USER_BIN_DIR" ]] && [[ "$TARGET_DIR" == "$SYSTEM_INSTALL_DIR" ]]; then
+            local user_versions=()
+            for file in "$USER_BIN_DIR"/tea*; do
+                if [[ -f "$file" ]]; then
+                    user_versions+=("$file")
+                fi
+            done
+
+            if [[ ${#user_versions[@]} -gt 0 ]]; then
+                print_warning "Found tea binaries in user bin directory:"
+                for file in "${user_versions[@]}"; do
+                    echo "  $file"
+                done
+                echo
+                read -p "Would you like to remove these user bin versions? (y/N): " -n 1 -r
+                echo
+                if [[ $REPLY =~ ^[Yy]$ ]]; then
+                    for file in "${user_versions[@]}"; do
+                        rm -f "$file"
+                        print_status "Removed $file"
+                    done
+                    print_success "Removed all user bin versions"
+                fi
+            fi
+        fi
+
         return 0
     else
         print_error "Tea CLI installation verification failed"
@@ -436,12 +434,14 @@ show_usage() {
     echo "  -h, --help     Show this help message"
     echo "  -v, --version  Install specific version (default: latest)"
     echo "  -f, --force    Force reinstall even if up-to-date"
+    echo "  -r, --reinstall Reinstall the current installed version"
     echo "  -p, --package  Force installation from package manager"
     echo "  -b, --binary   Force installation from binary"
     echo
     echo "Examples:"
     echo "  $0                    # Install latest version using best method"
     echo "  $0 -v v0.10.0         # Install specific version"
+    echo "  $0 --reinstall        # Reinstall current version"
     echo "  $0 --package          # Force installation from package manager"
     echo "  $0 --binary           # Force installation from binary"
     echo
@@ -451,8 +451,9 @@ show_usage() {
 main() {
     local target_version=""
     local force_reinstall=false
+    local reinstall_current=false
     local install_method="auto"
-    
+
     # Parse command line arguments
     while [[ $# -gt 0 ]]; do
         case $1 in
@@ -468,6 +469,10 @@ main() {
                 force_reinstall=true
                 shift
                 ;;
+            -r|--reinstall)
+                reinstall_current=true
+                shift
+                ;;
             -p|--package)
                 install_method="package"
                 shift
@@ -493,11 +498,24 @@ main() {
     if [[ $EUID -ne 0 ]]; then
         print_warning "Not running as root. Some operations may require sudo."
     fi
-    
+
     # Detect system
     detect_os
     ARCH=$(get_arch)
-    
+
+    # Handle reinstall current version
+    if [[ "$reinstall_current" == "true" ]]; then
+        local current_info=$(get_current_version)
+        local current_version=$(echo "$current_info" | cut -d: -f1)
+        if [[ "$current_version" == "not_installed" ]]; then
+            print_error "No current version installed to reinstall"
+            exit 1
+        fi
+        target_version="$current_version"
+        force_reinstall=true
+        print_status "Reinstalling current version: $target_version"
+    fi
+
     # Get latest version if not specified
     if [[ -z "$target_version" ]]; then
         get_latest_release