From f1ed75a6d42d8ec0044a2b07ac349641f6edc4d7 Mon Sep 17 00:00:00 2001
From: Peter Wood <peter@peterwood.dev>
Date: Fri, 30 May 2025 19:30:52 -0400
Subject: [PATCH] refactor: Remove golang-go from essential package list for
 shell setup

---
 setup-no-ollama.sh  | 60 +++++++++++++++------------------------------
 setup/packages.list |  1 -
 2 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/setup-no-ollama.sh b/setup-no-ollama.sh
index 5847708..eb0855e 100755
--- a/setup-no-ollama.sh
+++ b/setup-no-ollama.sh
@@ -2,41 +2,14 @@
 
 # Convenience script to run setup without Ollama installation
 # This script sets SKIP_OLLAMA=true and runs the main setup script
+#
+# Usage: ./setup-no-ollama.sh [setup script options]
+# Author: acedanger
+# Description: Runs setup while skipping Ollama and configures Fabric for external AI providers
 
 set -e
 
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-NC='\033[0m' # No Color
-
-echo -e "${GREEN}=== Shell Setup (Without Ollama) ===${NC}"
-echo -e "${YELLOW}This will install all packages and configurations except Ollama Docker setup${NC}"
-echo -e "${YELLOW}Fabric will be installed but configured for external AI providers${NC}"
-
-# Get the directory of this script
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-# Set SKIP_OLLAMA environment variable and run setup
-export SKIP_OLLAMA=true
-
-echo -e "\n${YELLOW}Running setup with SKIP_OLLAMA=true...${NC}"
-
-# Run the main setup script
-"$SCRIPT_DIR/setup/setup.sh" "$@"
-
-echo -e "\n${GREEN}=== Setup completed without Ollama ===${NC}"
-echo -e "${YELLOW}To configure Fabric with your preferred AI provider:${NC}"
-echo -e "${YELLOW}1. Edit ~/.config/fabric/.env${NC}"
-echo -e "${YELLOW}2. Add your API keys (OpenAI, Anthropic, Google, etc.)${NC}"
-echo -e "${YELLOW}3. Set DEFAULT_MODEL to your preferred model${NC}"
-echo -e "${YELLOW}4. Test with: fabric --list-patterns${NC}"
-#!/bin/bash
-
-# Convenience script to run setup without Ollama installation
-# This script sets SKIP_OLLAMA=true and runs the main setup script
-
-set -e
-
+# Define colors for output
 GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 BLUE='\033[0;34m'
@@ -58,20 +31,24 @@ echo -e "\n${YELLOW}Running setup with SKIP_OLLAMA=true...${NC}"
 # Run the main setup script
 "$SCRIPT_DIR/setup/setup.sh" "$@"
 
+# Configure Fabric after main setup completes
 echo -e "\n${BLUE}Configuring Fabric with external AI providers...${NC}"
 
 # Create Fabric config directory if it doesn't exist
 mkdir -p ~/.config/fabric
 
-# Download the pre-configured .env file
-echo -e "${YELLOW}Downloading Fabric .env configuration...${NC}"
-if curl -s https://gist.ptrwd.com/acedanger/7d564d3f611e4bab88004c15c2d30028/raw/HEAD/fabric-env -o ~/.config/fabric/.env; then
+# Download the pre-configured .env file from gist
+echo -e "${YELLOW}Downloading Fabric .env configuration from gist...${NC}"
+GIST_URL="https://gist.ptrwd.com/acedanger/7d564d3f611e4bab88004c15c2d30028/raw/HEAD/fabric-env"
+
+if curl -s "$GIST_URL" -o ~/.config/fabric/.env; then
     chmod 600 ~/.config/fabric/.env
     echo -e "${GREEN}✓ Fabric .env file configured successfully${NC}"
     
     # Verify the file was downloaded correctly
     if [ -s ~/.config/fabric/.env ]; then
-        echo -e "${GREEN}✓ Configuration file size: $(stat -c%s ~/.config/fabric/.env) bytes${NC}"
+        FILE_SIZE=$(stat -c%s ~/.config/fabric/.env 2>/dev/null || echo "unknown")
+        echo -e "${GREEN}✓ Configuration file downloaded: ${FILE_SIZE} bytes${NC}"
     else
         echo -e "${RED}⚠ Downloaded file appears to be empty${NC}"
     fi
@@ -93,10 +70,13 @@ else
 # Google Gemini Configuration
 #GOOGLE_API_KEY=your_google_api_key_here
 
+# Groq Configuration
+#GROQ_API_KEY=your_groq_api_key_here
+
 # Set your preferred default model
 DEFAULT_MODEL=gpt-4o-mini
 
-# For more providers and detailed configuration, see:
+# For complete provider list, see:
 # https://gist.ptrwd.com/acedanger/7d564d3f611e4bab88004c15c2d30028
 EOF
     chmod 600 ~/.config/fabric/.env
@@ -106,10 +86,10 @@ fi
 echo -e "\n${GREEN}=== Setup completed without Ollama ===${NC}"
 echo -e "${BLUE}Next steps for Fabric configuration:${NC}"
 echo -e "${YELLOW}1. Edit ~/.config/fabric/.env and add your API keys${NC}"
-echo -e "${YELLOW}2. Uncomment your preferred AI provider${NC}"
+echo -e "${YELLOW}2. Uncomment your preferred AI provider section${NC}"
 echo -e "${YELLOW}3. Set DEFAULT_MODEL to your preferred model${NC}"
-echo -e "${YELLOW}4. Test with: fabric --list-patterns${NC}"
-echo -e "\n${BLUE}Available AI providers:${NC}"
+echo -e "${YELLOW}4. Test configuration with: fabric --list-patterns${NC}"
+echo -e "\n${BLUE}Supported AI providers:${NC}"
 echo -e "${YELLOW}- OpenAI (GPT-4, GPT-4o, GPT-3.5-turbo)${NC}"
 echo -e "${YELLOW}- Anthropic (Claude-3.5-sonnet, Claude-3-haiku)${NC}"
 echo -e "${YELLOW}- Google (Gemini-pro, Gemini-1.5-pro)${NC}"
diff --git a/setup/packages.list b/setup/packages.list
index 3c136ca..df8a2e8 100644
--- a/setup/packages.list
+++ b/setup/packages.list
@@ -3,7 +3,6 @@
 
 // Core tools
 git
-golang-go
 python3
 wget
 curl