Add SSH key upload UI and connection retry view

Introduces a new SSH key upload form accessible from the host list (press 'k'), allowing users to select or paste a public key and upload it via ssh-copy-id, with optional SSH config update. Adds a connection error view with retry/back-to-list options, and refactors the update command to use the install script instead of manual binary replacement. Updates internal state and view handling to support these new features.

Author: xvertile

cmd/update.go

@@ -1,17 +1,10 @@
 package cmd
 
 import (
-	"archive/tar"
-	"compress/gzip"
 	"context"
 	"fmt"
-	"io"
-	"net/http"
 	"os"
 	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
 	"time"
 
 	"github.com/xvertile/sshc/internal/version"
@@ -30,8 +23,7 @@ var updateCmd = &cobra.Command{
 
 This command will:
   1. Check GitHub for the latest release
-  2. Download the appropriate binary for your system
-  3. Replace the current binary with the new version
+  2. Run the install script to update to the latest version
 
 Examples:
   sshc update         # Update to latest version if available
@@ -69,197 +61,20 @@ func runUpdate(cmd *cobra.Command, args []string) {
 		fmt.Printf("Reinstalling current version (%s)\n", AppVersion)
 	}
 
-	// Determine OS and architecture
-	goos := runtime.GOOS
-	goarch := runtime.GOARCH
+	fmt.Println("Running install script...")
 
-	if goos != "darwin" && goos != "linux" {
-		fmt.Fprintf(os.Stderr, "Unsupported operating system: %s\n", goos)
-		os.Exit(1)
-	}
-
-	if goarch != "amd64" && goarch != "arm64" {
-		fmt.Fprintf(os.Stderr, "Unsupported architecture: %s\n", goarch)
-		os.Exit(1)
-	}
-
-	// Get the version to download
-	downloadVersion := updateInfo.LatestVer
-	if !updateInfo.Available && forceUpdate {
-		downloadVersion = AppVersion
-	}
-
-	// Strip 'v' prefix for filename
-	versionNum := strings.TrimPrefix(downloadVersion, "v")
-
-	// Construct download URL
-	filename := fmt.Sprintf("sshc_%s_%s_%s.tar.gz", versionNum, goos, goarch)
-	downloadURL := fmt.Sprintf("https://github.com/xvertile/sshc/releases/download/%s/%s", downloadVersion, filename)
-
-	fmt.Printf("Downloading %s...\n", filename)
-
-	// Download the release
-	resp, err := http.Get(downloadURL)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error downloading update: %v\n", err)
-		os.Exit(1)
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		fmt.Fprintf(os.Stderr, "Error downloading update: HTTP %d\n", resp.StatusCode)
-		os.Exit(1)
-	}
-
-	// Create temp directory
-	tmpDir, err := os.MkdirTemp("", "sshc-update-*")
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error creating temp directory: %v\n", err)
-		os.Exit(1)
-	}
-	defer os.RemoveAll(tmpDir)
+	// Run the install script via curl and bash
+	installCmd := exec.Command("bash", "-c", "curl -fsSL https://raw.githubusercontent.com/xvertile/sshc/main/install/install.sh | bash")
+	installCmd.Stdin = os.Stdin
+	installCmd.Stdout = os.Stdout
+	installCmd.Stderr = os.Stderr
 
-	// Extract the tarball
-	fmt.Println("Extracting...")
-	if err := extractTarGz(resp.Body, tmpDir); err != nil {
-		fmt.Fprintf(os.Stderr, "Error extracting update: %v\n", err)
+	if err := installCmd.Run(); err != nil {
+		fmt.Fprintf(os.Stderr, "Error running install script: %v\n", err)
 		os.Exit(1)
 	}
 
-	// Find the binary
-	newBinary := filepath.Join(tmpDir, "sshc")
-	if _, err := os.Stat(newBinary); os.IsNotExist(err) {
-		fmt.Fprintf(os.Stderr, "Error: binary not found in archive\n")
-		os.Exit(1)
-	}
-
-	// Get current binary path
-	currentBinary, err := os.Executable()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error finding current binary: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Resolve symlinks
-	currentBinary, err = filepath.EvalSymlinks(currentBinary)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error resolving binary path: %v\n", err)
-		os.Exit(1)
-	}
-
-	fmt.Printf("Installing to %s...\n", currentBinary)
-
-	// Check if we need sudo
-	needSudo := false
-	if err := os.Rename(newBinary, currentBinary); err != nil {
-		if os.IsPermission(err) {
-			needSudo = true
-		} else {
-			// Try copying instead (cross-device link)
-			if err := copyFile(newBinary, currentBinary); err != nil {
-				if os.IsPermission(err) {
-					needSudo = true
-				} else {
-					fmt.Fprintf(os.Stderr, "Error installing update: %v\n", err)
-					os.Exit(1)
-				}
-			}
-		}
-	}
-
-	if needSudo {
-		fmt.Println("Need elevated privileges to install...")
-		sudoCmd := exec.Command("sudo", "cp", newBinary, currentBinary)
-		sudoCmd.Stdin = os.Stdin
-		sudoCmd.Stdout = os.Stdout
-		sudoCmd.Stderr = os.Stderr
-		if err := sudoCmd.Run(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error installing with sudo: %v\n", err)
-			os.Exit(1)
-		}
-
-		// Set permissions
-		chmodCmd := exec.Command("sudo", "chmod", "+x", currentBinary)
-		if err := chmodCmd.Run(); err != nil {
-			fmt.Fprintf(os.Stderr, "Error setting permissions: %v\n", err)
-			os.Exit(1)
-		}
-	} else {
-		// Set permissions
-		if err := os.Chmod(currentBinary, 0755); err != nil {
-			fmt.Fprintf(os.Stderr, "Error setting permissions: %v\n", err)
-			os.Exit(1)
-		}
-	}
-
-	fmt.Printf("\nSuccessfully updated to %s\n", downloadVersion)
-
-	// Show new version
-	versionCmd := exec.Command(currentBinary, "--version")
-	versionCmd.Stdout = os.Stdout
-	versionCmd.Stderr = os.Stderr
-	versionCmd.Run()
-}
-
-// extractTarGz extracts a tar.gz archive to the destination directory
-func extractTarGz(r io.Reader, dest string) error {
-	gzr, err := gzip.NewReader(r)
-	if err != nil {
-		return err
-	}
-	defer gzr.Close()
-
-	tr := tar.NewReader(gzr)
-
-	for {
-		header, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		target := filepath.Join(dest, header.Name)
-
-		switch header.Typeflag {
-		case tar.TypeDir:
-			if err := os.MkdirAll(target, 0755); err != nil {
-				return err
-			}
-		case tar.TypeReg:
-			f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
-			if err != nil {
-				return err
-			}
-
-			if _, err := io.Copy(f, tr); err != nil {
-				f.Close()
-				return err
-			}
-			f.Close()
-		}
-	}
-
-	return nil
-}
-
-// copyFile copies a file from src to dst
-func copyFile(src, dst string) error {
-	source, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer source.Close()
-
-	destination, err := os.Create(dst)
-	if err != nil {
-		return err
-	}
-	defer destination.Close()
-
-	_, err = io.Copy(destination, source)
-	return err
+	fmt.Println("\nUpdate complete!")
 }
 
 func init() {

internal/ui/model.go

@@ -48,6 +48,8 @@ const (
 	ViewK8sAdd
 	ViewK8sEdit
 	ViewTheme
+	ViewConnectionError
+	ViewSSHKeyUpload
 )
 
 // PortForwardType defines the type of port forwarding
@@ -127,6 +129,7 @@ type Model struct {
 	k8sAddForm        *k8sAddFormModel
 	k8sEditForm       *k8sEditFormModel
 	themePicker       *themePickerModel
+	sshKeyUploadForm  *sshKeyUploadModel
 
 	// Terminal size and styles
 	width  int
@@ -137,6 +140,11 @@ type Model struct {
 	// Error handling
 	errorMessage string
 	showingError bool
+
+	// Connection retry state
+	connectionHost  string // Host being connected to
+	connectionIsK8s bool   // Whether it's a k8s host
+	connectionError string // Last connection error
 }
 
 // updateTableStyles updates the table header border color based on focus state