Merge pull request #272 from shelltime/feat/homebrew-path-support

feat(cli): support Homebrew binary paths for daemon and hooks

Author: AnnatarHe

README.md

@@ -9,6 +9,14 @@ The Go module path is `github.com/malamtime/cli`. That naming mismatch is intent
 
 ## Install
 
+### Homebrew (macOS and Linux)
+
+```bash
+brew install shelltime/tap/shelltime
+```
+
+### curl installer
+
 ```bash
 curl -sSL https://shelltime.xyz/i | bash
 ```

commands/daemon.install.go

@@ -29,33 +29,32 @@ func commandDaemonInstall(c *cli.Context) error {
 	baseFolder := filepath.Join(currentUser.HomeDir, ".shelltime")
 	username := currentUser.Username
 
-	installer, err := model.NewDaemonInstaller(baseFolder, username)
-	if err != nil {
-		return err
-	}
-
-	installer.CheckAndStopExistingService()
-
-	// check latest file exist or not
-	if _, err := os.Stat(filepath.Join(baseFolder, "bin/shelltime-daemon.bak")); err == nil {
+	// Handle .bak upgrade for curl-installer users
+	bakPath := filepath.Join(baseFolder, "bin/shelltime-daemon.bak")
+	if _, err := os.Stat(bakPath); err == nil {
 		color.Yellow.Println("🔄 Found latest daemon file, restoring...")
-		// try to remove old file
 		_ = os.Remove(filepath.Join(baseFolder, "bin/shelltime-daemon"))
-		// rename .bak to original
-		if err := os.Rename(
-			filepath.Join(baseFolder, "bin/shelltime-daemon.bak"),
-			filepath.Join(baseFolder, "bin/shelltime-daemon"),
-		); err != nil {
+		if err := os.Rename(bakPath, filepath.Join(baseFolder, "bin/shelltime-daemon")); err != nil {
 			return fmt.Errorf("failed to restore latest daemon: %w", err)
 		}
 	}
 
-	// check shelltime-daemon
-	if _, err := os.Stat(filepath.Join(baseFolder, "bin/shelltime-daemon")); err != nil {
-		color.Yellow.Println("⚠️ shelltime-daemon not found, please reinstall the CLI first:")
-		color.Yellow.Println("curl -sSL https://raw.githubusercontent.com/malamtime/installation/master/install.bash | bash")
+	// Resolve daemon binary (curl-installer, Homebrew, or PATH)
+	daemonBinPath, err := model.ResolveDaemonBinaryPath()
+	if err != nil {
+		color.Yellow.Println("⚠️ shelltime-daemon not found.")
+		color.Yellow.Println("Install via Homebrew:  brew install shelltime/tap/shelltime")
+		color.Yellow.Println("Or via curl installer: curl -sSL https://shelltime.xyz/i | bash")
 		return nil
 	}
+	color.Green.Printf("✅ Found daemon binary at: %s\n", daemonBinPath)
+
+	installer, err := model.NewDaemonInstaller(baseFolder, username, daemonBinPath)
+	if err != nil {
+		return err
+	}
+
+	installer.CheckAndStopExistingService()
 
 	// User-level installation - no system-wide symlink needed
 	color.Yellow.Println("🔍 Setting up user-level daemon installation...")

commands/daemon.status.go

@@ -53,7 +53,7 @@ func commandDaemonStatus(c *cli.Context) error {
 	}
 
 	// Check 3: Service manager status
-	installer, installerErr := model.NewDaemonInstaller("", "")
+	installer, installerErr := model.NewDaemonInstaller("", "", "")
 	if installerErr == nil {
 		if err := installer.Check(); err == nil {
 			printSuccess("Service is registered and running")

commands/daemon.uninstall.go

@@ -28,7 +28,7 @@ func commandDaemonUninstall(c *cli.Context) error {
 	baseFolder := filepath.Join(currentUser.HomeDir, ".shelltime")
 	username := currentUser.Username
 
-	installer, err := model.NewDaemonInstaller(baseFolder, username)
+	installer, err := model.NewDaemonInstaller(baseFolder, username, "")
 	if err != nil {
 		return err
 	}

commands/doctor.go

@@ -91,7 +91,7 @@ func commandDoctor(c *cli.Context) error {
 
 	// 5. Check daemon process
 	printSectionHeader("Daemon Process")
-	daemonInstaller, err := model.NewDaemonInstaller("", "")
+	daemonInstaller, err := model.NewDaemonInstaller("", "", "")
 	if err != nil {
 		printError(fmt.Sprintf("Error checking daemon installer: %v", err))
 		return err

commands/hooks.install.go

@@ -3,6 +3,7 @@ package commands
 import (
 	"fmt"
 	"os"
+	"os/exec"
 
 	"github.com/gookit/color"
 	"github.com/malamtime/cli/model"
@@ -17,9 +18,12 @@ var HooksInstallCommand = &cli.Command{
 
 func commandHooksInstall(c *cli.Context) error {
 	binFolder := os.ExpandEnv(fmt.Sprintf("$HOME/%s/bin", model.COMMAND_BASE_STORAGE_FOLDER))
-	if _, err := os.Stat(binFolder); os.IsNotExist(err) {
-		color.Red.Println("📁 cannot find bin folder at", binFolder)
-		color.Red.Println("Please run 'curl -sSL https://raw.githubusercontent.com/malamtime/installation/master/install.bash | bash' first")
+	_, binFolderErr := os.Stat(binFolder)
+	_, lookPathErr := exec.LookPath("shelltime")
+	if os.IsNotExist(binFolderErr) && lookPathErr != nil {
+		color.Red.Println("📁 shelltime binary not found.")
+		color.Red.Println("Install via Homebrew:  brew install shelltime/tap/shelltime")
+		color.Red.Println("Or via curl installer: curl -sSL https://shelltime.xyz/i | bash")
 		return nil
 	}
 

model/daemon-installer.darwin.go

@@ -18,16 +18,18 @@ var daemonMacServiceDesc []byte
 
 // MacDaemonInstaller implements DaemonInstaller for macOS systems
 type MacDaemonInstaller struct {
-	baseFolder  string
-	serviceName string
-	user        string
+	baseFolder    string
+	serviceName   string
+	user          string
+	daemonBinPath string
 }
 
-func NewMacDaemonInstaller(baseFolder, user string) *MacDaemonInstaller {
+func NewMacDaemonInstaller(baseFolder, user, daemonBinPath string) *MacDaemonInstaller {
 	return &MacDaemonInstaller{
-		baseFolder:  baseFolder,
-		user:        user,
-		serviceName: "xyz.shelltime.daemon",
+		baseFolder:    baseFolder,
+		user:          user,
+		serviceName:   "xyz.shelltime.daemon",
+		daemonBinPath: daemonBinPath,
 	}
 }
 
@@ -163,8 +165,9 @@ func (m *MacDaemonInstaller) GetDaemonServiceFile(username string) (buf bytes.Bu
 		return
 	}
 	err = tmpl.Execute(&buf, map[string]string{
-		"UserName":   username,
-		"BaseFolder": m.baseFolder,
+		"UserName":      username,
+		"BaseFolder":    m.baseFolder,
+		"DaemonBinPath": m.daemonBinPath,
 	})
 	return
 }

model/daemon-installer.go

@@ -18,12 +18,12 @@ type DaemonInstaller interface {
 }
 
 // Factory function to create appropriate installer based on OS
-func NewDaemonInstaller(baseFolder, username string) (DaemonInstaller, error) {
+func NewDaemonInstaller(baseFolder, username, daemonBinPath string) (DaemonInstaller, error) {
 	switch runtime.GOOS {
 	case "linux":
-		return NewLinuxDaemonInstaller(baseFolder, username), nil
+		return NewLinuxDaemonInstaller(baseFolder, username, daemonBinPath), nil
 	case "darwin":
-		return NewMacDaemonInstaller(baseFolder, username), nil
+		return NewMacDaemonInstaller(baseFolder, username, daemonBinPath), nil
 	default:
 		return nil, fmt.Errorf("unsupported operating system: %s", runtime.GOOS)
 	}

model/daemon-installer.linux.go

@@ -19,12 +19,13 @@ var daemonLinuxServiceDesc []byte
 
 // LinuxDaemonInstaller implements DaemonInstaller for Linux systems
 type LinuxDaemonInstaller struct {
-	baseFolder string
-	user       string
+	baseFolder    string
+	user          string
+	daemonBinPath string
 }
 
-func NewLinuxDaemonInstaller(baseFolder, user string) *LinuxDaemonInstaller {
-	return &LinuxDaemonInstaller{baseFolder: baseFolder, user: user}
+func NewLinuxDaemonInstaller(baseFolder, user, daemonBinPath string) *LinuxDaemonInstaller {
+	return &LinuxDaemonInstaller{baseFolder: baseFolder, user: user, daemonBinPath: daemonBinPath}
 }
 
 // getXDGRuntimeDir returns the XDG_RUNTIME_DIR path for the current user
@@ -221,8 +222,9 @@ func (l *LinuxDaemonInstaller) GetDaemonServiceFile(username string) (buf bytes.
 		return
 	}
 	err = tmpl.Execute(&buf, map[string]string{
-		"UserName":   username,
-		"BaseFolder": l.baseFolder,
+		"UserName":      username,
+		"BaseFolder":    l.baseFolder,
+		"DaemonBinPath": l.daemonBinPath,
 	})
 	return
 }

model/hooks/bash.bash

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# Source bash-preexec.sh if it exists
+if [ -f "bash-preexec.sh" ]; then
+    source "bash-preexec.sh"
+else
+    # Attempt to find bash-preexec.sh in the same directory as this script
+    _SHELLTIME_HOOK_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+    if [ -f "$_SHELLTIME_HOOK_DIR/bash-preexec.sh" ]; then
+        source "$_SHELLTIME_HOOK_DIR/bash-preexec.sh"
+    else
+        echo "Warning: bash-preexec.sh not found. Pre-execution hooks will not work."
+        return 1
+    fi
+fi
+
+# Check if shelltime CLI exists
+if ! command -v shelltime &> /dev/null
+then
+    echo "Warning: shelltime CLI not found. Please install it to enable time tracking."
+else
+    shelltime gc
+fi
+
+# Create a timestamp for the session when the shell starts
+SESSION_ID=$(date +%Y%m%d%H%M%S)
+LAST_COMMAND=""
+
+# Function to be executed before each command
+preexec_invoke_cmd() {
+    local CMD="$1"
+    LAST_COMMAND="$CMD"
+    # Check if command starts with exit, logout, or reboot
+    if [[ "$CMD" =~ ^(exit|logout|reboot) ]]; then
+        return
+    fi
+
+    # Avoid tracking shelltime commands themselves to prevent loops
+    if [[ "$CMD" =~ ^shelltime ]]; then
+        return
+    fi
+
+    shelltime track -s=bash -id=$SESSION_ID -cmd="$CMD" -p=pre --ppid=$PPID &> /dev/null
+}
+
+# Function to be executed after each command (before prompt)
+precmd_invoke_cmd() {
+    local LAST_RESULT=$?
+    # BASH_COMMAND in precmd is the *previous* command
+    local CMD="$LAST_COMMAND"
+    # Check if command starts with exit, logout, or reboot
+    if [[ "$CMD" =~ ^(exit|logout|reboot) ]]; then
+        return
+    fi
+
+    # Avoid tracking shelltime commands themselves to prevent loops
+    if [[ "$CMD" =~ ^shelltime ]]; then
+        return
+    fi
+
+    # Ensure CMD is not empty or the precmd_invoke_cmd itself
+    if [ -z "$CMD" ] || [ "$CMD" == "precmd_invoke_cmd" ]; then
+        return
+    fi
+
+    shelltime track -s=bash -id=$SESSION_ID -cmd="$CMD" -p=post -r=$LAST_RESULT --ppid=$PPID &> /dev/null
+}
+
+# Set the functions for bash-preexec
+preexec_functions+=(preexec_invoke_cmd)
+precmd_functions+=(precmd_invoke_cmd)