installer: fixing several installer and doc issues

Author: trly

.github/workflows/release-installer.yml

@@ -23,52 +23,24 @@ jobs:
         # Create version based on date + short commit (e.g., v2025.01.19.abc1234)
         echo "version=v$(date +%Y.%m.%d).$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
       
-    - name: Create release in private repository
+    - name: Create release
       uses: softprops/action-gh-release@v2
       with:
         tag_name: ${{ steps.vars.outputs.version }}
         name: "Revenue Installer ${{ steps.vars.outputs.version }}"
         body: |
-          🚀 **Revenue Team Workstation Installer**
+          **Revenue Team Workstation Installer**
           
-          Internal release for the Revenue team workstation setup.
-          For public access, use: https://github.com/sourcegraph/revenue-installer/releases/latest/download/install.sh
-          
-          **What it does:**
-          - Sets up macOS development environment
-          - Installs VS Code, Python, Java, and other tools
-          - Configures demo applications
-          - Creates global `revenue` command
-          
-          **Requirements:**
-          - macOS (10.15+)
-          - GitHub access to sourcegraph/revenue repository
-          
-          Updated from commit: ${{ steps.vars.outputs.sha_short }}
-        files: |
-          install.sh
-        prerelease: false
-        generate_release_notes: false
-    
-    - name: Create public release
-      uses: softprops/action-gh-release@v2
-      with:
-        repository: sourcegraph/revenue-installer
-        tag_name: ${{ steps.vars.outputs.version }}
-        name: "Revenue Installer ${{ steps.vars.outputs.version }}"
-        body: |
-          🚀 **Revenue Team Workstation Installer**
-          
-          Public installer for the Sourcegraph Revenue team workstation setup.
+          Workstation setup installer for the Sourcegraph Revenue team.
           
           **Usage:**
           ```bash
-          /bin/bash -c "$(curl -fsSL https://github.com/sourcegraph/revenue-installer/releases/latest/download/install.sh)"
+          /bin/bash -c "$(curl -fsSL https://github.com/sourcegraph/revenue/releases/latest/download/install.sh)"
           ```
           
           **What it does:**
           - Sets up macOS development environment
-          - Installs VS Code, Python, Java, and other tools  
+          - Installs VS Code, Python, Java, and other tools
           - Configures demo applications
           - Creates global `revenue` command
           

AGENTS.md

@@ -2,7 +2,8 @@
 
 ## Build/Test Commands
 
-- `./revenue init` - Initialize workstation with development tools
+- `./install.sh` - Initialize workstation with development tools (bootstrap)
+- `./revenue init` - Initialize workstation (alternative method)
 - `./revenue update` - Update existing tools and packages  
 - `./revenue help` - Show usage help
 - `revenue init|update|demo` - Global command after setup

DETAILS.md

@@ -1,7 +1,7 @@
 # Revenue Team Application Manifest
 
 This list is everything that will be installed on your workstation when running
-`revenue init`. All dependencies are managed via [Brewfile](/Brewfile).
+the installer. All dependencies are managed via [Brewfile](/Brewfile).
 
 To update existing installed tools, run `revenue update`
 

README.md

@@ -7,10 +7,11 @@ Complete macOS workstation setup for Revenue team members. Installs all tools ne
 **Copy and paste this command into Terminal:**
 
 ```bash
-/bin/bash -c "$(curl -fsSL https://github.com/sourcegraph/revenue-installer/releases/latest/download/install.sh)"
+/bin/bash -c "$(curl -fsSL https://github.com/sourcegraph/revenue/releases/latest/download/install.sh)"
 ```
 
 **That's it!** The installer will:
+
 - Download this repository to `~/revenue`
 - Install all necessary tools (VS Code, Python, Java, etc.)
 - Set up demo applications
@@ -56,23 +57,28 @@ See [amp_demos/README.md](amp_demos/README.md) for complete demo documentation.
 ### Common Issues
 
 **"Command not found: revenue"**
+
 - Close and reopen Terminal, or run: `source ~/.zshrc`
 
 **"Cannot clone repository"**
+
 - Ensure you have access to GitHub and the Sourcegraph organization
 - Ask in [#ask-tech-ops](https://sourcegraph.slack.com/archives/C01CSS3TC75) for repository access
 
 **Installation fails with network errors**
+
 - Check VPN/proxy settings
 - Rerun the installer - it's safe to run multiple times
 
 **"Xcode Command Line Tools required"**
+
 - Run: `xcode-select --install`
 - Wait for installation to complete, then rerun the installer
 
 ### Get Help
 
 If you're stuck:
+
 1. Check the error message for specific guidance
 2. Try running the installer again (it's safe to repeat)
 3. Ask in [#ask-tech-ops](https://sourcegraph.slack.com/archives/C01CSS3TC75) with the error details
@@ -90,12 +96,13 @@ git clone https://github.com/sourcegraph/revenue.git ~/revenue
 cd ~/revenue
 
 # 3. Run setup
-./revenue init
+./install.sh
 ```
 
 ## What Gets Installed
 
 The setup installs development tools and applications including:
+
 - **Editors**: VS Code (with extensions), JetBrains Toolbox
 - **Languages**: Python, Java, Node.js
 - **Tools**: Git, Amp CLI, mise, tmux, jq

install.sh

@@ -31,8 +31,8 @@ print_error() {
 
 print_header() {
   echo ""
-  echo "🚀 Sourcegraph Revenue Team Workstation Setup"
-  echo "============================================="
+  echo "Sourcegraph Revenue Team Workstation Setup"
+  echo "=========================================="
   echo ""
   print_info "This will set up your macOS workstation with all the tools needed for demos and development."
   print_info "Estimated time: 15-30 minutes (depending on internet speed)"
@@ -87,15 +87,15 @@ check_github_access() {
   echo ""
   print_info "Please choose one of these authentication methods:"
   echo ""
-  echo "1. 📱 GitHub CLI (Recommended):"
+  echo "1. GitHub CLI (Recommended):"
   print_info "   Install: brew install gh"  
   print_info "   Login:   gh auth login"
   echo ""
-  echo "2. 🔐 SSH Key:"
+  echo "2. SSH Key:"
   print_info "   Generate: ssh-keygen -t ed25519 -C \"your_email@example.com\""
   print_info "   Add to GitHub: https://github.com/settings/keys"
   echo ""
-  echo "3. 🌐 Personal Access Token:"
+  echo "3. Personal Access Token:"
   print_info "   Create: https://github.com/settings/tokens"
   print_info "   Configure: git config --global github.token YOUR_TOKEN"
   echo ""
@@ -124,8 +124,14 @@ setup_repository() {
       # Update repository
       git fetch origin >/dev/null 2>&1
       if [[ "$current_branch" == "main" ]]; then
-        git pull origin main >/dev/null 2>&1
-        print_success "Updated to latest version"
+        # Check if working directory is clean
+        if git diff-index --quiet HEAD -- 2>/dev/null; then
+          git pull origin main >/dev/null 2>&1
+          print_success "Updated to latest version"
+        else
+          print_warning "Repository has uncommitted changes, skipping update"
+          print_info "Using current version for installation"
+        fi
       else
         print_warning "Repository is on branch '$current_branch', not 'main'"
         print_info "Consider switching to main for latest updates"
@@ -397,7 +403,7 @@ main() {
   run_installer
 
   echo ""
-  print_success "🎉 Setup complete!"
+  print_success "Setup complete!"
   print_info "You can now use the 'revenue' command to manage your workstation and demos."
   print_info "Try: revenue demo list"
   echo ""

revenue

@@ -324,15 +324,28 @@ init_environment() {
   print_info "Delegating to bootstrap installer for complete setup..."
   echo ""
 
-  # Use the consolidated installer
+  # Use local install.sh if available, otherwise download it
+  local local_installer="$SCRIPT_DIR/install.sh"
   local installer_url="https://raw.githubusercontent.com/sourcegraph/revenue/main/install.sh"
-  if curl -fsSL "$installer_url" | bash; then
-    print_success "Environment initialization completed!"
+  
+  if [[ -f "$local_installer" ]]; then
+    print_info "Using local installer..."
+    if bash "$local_installer"; then
+      print_success "Environment initialization completed!"
+    else
+      print_error "Local installation failed"
+      exit 1
+    fi
   else
-    print_error "Installation failed"
-    print_info "You can also run the installer directly:"
-    print_info "  curl -fsSL $installer_url | bash"
-    exit 1
+    print_info "Downloading installer from repository..."
+    if curl -fsSL "$installer_url" | bash; then
+      print_success "Environment initialization completed!"
+    else
+      print_error "Installation failed"
+      print_info "You can also run the installer directly:"
+      print_info "  curl -fsSL $installer_url | bash"
+      exit 1
+    fi
   fi
 }