### Summary of Changes Fixes **#53** (*Fish shell integration panics with `inappropriate ioctl for device`*). #### 1. Fixed Non-TTY Stdin (`panic: inappropriate ioctl for device`) — Fixes #53 - **Root Cause**: When executing `iris init fish | source` (or sourcing shell configs), `os.Stdin` (FD 0) is connected to a pipe instead of a TTY. Calling `term.MakeRaw()` on a pipe returns `ENOTTY`. - **Fix**: Guarded `term.MakeRaw()` with `term.IsTerminal()` checks across `root/wrapper.go` and `root/root.go`. Added fallback to open and use `/dev/tty` when `os.Stdin` is not a terminal device. - **Fish IPC Hooks**: Added `fish_preexec` and `fish_postexec` event handlers to `iris init fish` to send `IRIS_CMD_START` / `IRIS_CMD_STOP` IPC signals over `$IRIS_FD`. #### 2. Fixed Shell Setup Order (Duplicate `fastfetch` / startup executions) — Fixes #53 - **Root Cause**: `iris setup` appended the init script to the bottom of shell configs (`config.fish`, `.zshrc`, `.bashrc`), causing pre-existing interactive startup commands to run twice. - **Fix**: Updated `setupCmd` in `root/init.go` to **prepend** `# Iris Autocomplete` to the top of shell configuration files. #### 3. Fixed Terminal Exit Loop Handling — Relates to #50 - **Root Cause**: When typing `exit` in the wrapped shell, Linux PTY returns `syscall.EIO` (`Input/output error`) on `ptmx.Read()` rather than `io.EOF`. `runWrapper()` was ignoring non-EOF errors and looping indefinitely without restoring the terminal or calling `os.Exit(0)`. - **Fix**: Updated the `ptmx.Read` error handler in `root/wrapper.go` to handle `syscall.EIO` and exit cleanly. --- ### Issues Addressed - Closes #53 - Relates to #50, #55 --- ### Verification Tested - [x] Verified `iris setup fish` / `iris init fish | source` initializes without `ioctl` panic. - [x] Verified typing `exit` in Fish, Zsh, and Bash terminates IRIS cleanly and restores standard terminal state. - [x] Ran `go test ./...` — all tests pass. --------- Co-authored-by: verse91 <versedev.store@proton.me> Co-authored-by: VERSE <sunnyone0901@gmail.com>
261 lines
6.6 KiB
Go
261 lines
6.6 KiB
Go
package root
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/versenilvis/iris/integration/shell"
|
|
"github.com/versenilvis/iris/internal/config"
|
|
)
|
|
|
|
var initCmd = &cobra.Command{
|
|
Use: "init [bash|zsh|fish]",
|
|
Short: "Generate the autostart script for your shell",
|
|
Long: `Add the output of this command to your shell's configuration file to start Iris automatically.
|
|
For example, add this to your ~/.zshrc:
|
|
eval "$(iris init zsh)"`,
|
|
ValidArgs: []string{"bash", "zsh", "fish"},
|
|
Args: cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
shell := args[0]
|
|
switch shell {
|
|
case "zsh":
|
|
fmt.Printf(`
|
|
# Iris Autostart Hook
|
|
if [ -n "$TMUX" ] && [ -n "$IRIS_PID" ]; then
|
|
if ps -o comm= -p $PPID 2>/dev/null | grep -q "tmux"; then
|
|
unset IRIS_PID IRIS_IS_CHILD IRIS_FD
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$IRIS_PID" ] && [ -z "$IRIS_RESCUE" ]; then
|
|
export IRIS_ACTIVE_SHELL="zsh"
|
|
exec iris
|
|
fi
|
|
|
|
# Iris Autocomplete Hook
|
|
if [ -n "$IRIS_PID" ] && [ -n "$IRIS_FD" ]; then
|
|
_iris_send_lbuffer() {
|
|
print -u $IRIS_FD -N -r -- "$LBUFFER" 2>/dev/null
|
|
}
|
|
|
|
_iris_precmd() {
|
|
print -u $IRIS_FD -N -r -- "IRIS_CMD_STOP" 2>/dev/null
|
|
}
|
|
|
|
_iris_preexec() {
|
|
print -u $IRIS_FD -N -r -- "IRIS_CMD_START" 2>/dev/null
|
|
}
|
|
|
|
autoload -Uz add-zle-hook-widget
|
|
autoload -Uz add-zsh-hook
|
|
|
|
add-zle-hook-widget line-pre-redraw _iris_send_lbuffer
|
|
add-zsh-hook precmd _iris_precmd
|
|
add-zsh-hook preexec _iris_preexec
|
|
fi
|
|
`)
|
|
case "bash":
|
|
fmt.Printf(`
|
|
# Iris Autostart Hook
|
|
if [ -n "$TMUX" ] && [ -n "$IRIS_PID" ]; then
|
|
if ps -o comm= -p $PPID 2>/dev/null | grep -q "tmux"; then
|
|
unset IRIS_PID IRIS_IS_CHILD IRIS_FD
|
|
fi
|
|
fi
|
|
|
|
if [ -z "$IRIS_PID" ] && [ -z "$IRIS_RESCUE" ]; then
|
|
export IRIS_ACTIVE_SHELL="bash"
|
|
exec iris
|
|
fi
|
|
`)
|
|
case "fish":
|
|
fmt.Printf(`
|
|
# Iris Autostart Hook
|
|
if set -q TMUX; and set -q IRIS_PID
|
|
if ps -o comm= -p $PPID 2>/dev/null | grep -q "tmux"
|
|
set -e IRIS_PID
|
|
set -e IRIS_IS_CHILD
|
|
set -e IRIS_FD
|
|
end
|
|
end
|
|
|
|
if status is-interactive; and not set -q IRIS_PID; and not set -q IRIS_RESCUE
|
|
set -gx IRIS_ACTIVE_SHELL "fish"
|
|
exec iris
|
|
end
|
|
|
|
# Iris Autocomplete Hook
|
|
if set -q IRIS_PID; and set -q IRIS_FD
|
|
function _iris_fish_postexec --on-event fish_postexec
|
|
echo -n -e "IRIS_CMD_STOP\x00" >&$IRIS_FD 2>/dev/null
|
|
end
|
|
function _iris_fish_preexec --on-event fish_preexec
|
|
echo -n -e "IRIS_CMD_START\x00" >&$IRIS_FD 2>/dev/null
|
|
end
|
|
end
|
|
`)
|
|
}
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
rootCmd.AddCommand(initCmd)
|
|
rootCmd.AddCommand(setupCmd)
|
|
}
|
|
|
|
var setupCmd = &cobra.Command{
|
|
Use: "setup [shell]",
|
|
Short: "Automatically setup iris shell integration and install binary",
|
|
Args: cobra.MaximumNArgs(1),
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
home, _ := os.UserHomeDir()
|
|
|
|
localBin := filepath.Join(home, ".local", "bin")
|
|
_ = os.MkdirAll(localBin, 0755)
|
|
|
|
exe, _ := os.Executable()
|
|
targetExe := filepath.Join(localBin, "iris")
|
|
|
|
fmt.Printf("Installing iris to %s...\n", targetExe)
|
|
input, err := os.ReadFile(exe)
|
|
if err != nil {
|
|
fmt.Printf("Failed to read current executable: %v\n", err)
|
|
return
|
|
}
|
|
|
|
_ = os.Remove(targetExe)
|
|
err = os.WriteFile(targetExe, input, 0755)
|
|
if err != nil {
|
|
fmt.Printf("Failed to write to %s: %v\n", targetExe, err)
|
|
return
|
|
}
|
|
|
|
var shellName string
|
|
if len(args) > 0 {
|
|
shellName = args[0]
|
|
} else {
|
|
shellPath := os.Getenv("SHELL")
|
|
shellName = filepath.Base(shellPath)
|
|
}
|
|
var configFile string
|
|
var evalCmd string
|
|
|
|
switch shellName {
|
|
case "zsh":
|
|
configFile = filepath.Join(shell.GetZshConfigDir(), ".zshrc")
|
|
evalCmd = `eval "$(iris init zsh)"`
|
|
case "bash":
|
|
configFile = filepath.Join(home, ".bashrc")
|
|
evalCmd = `eval "$(iris init bash)"`
|
|
case "fish":
|
|
configFile = filepath.Join(shell.GetFishConfigDir(), "config.fish")
|
|
evalCmd = `iris init fish | source`
|
|
default:
|
|
fmt.Printf("Unsupported shell: %s. Please add iris init manually.\n", shellName)
|
|
return
|
|
}
|
|
|
|
content, readErr := os.ReadFile(configFile)
|
|
if strings.Contains(string(content), "iris init") {
|
|
fmt.Printf("Iris is already configured in %s\n", configFile)
|
|
} else {
|
|
var newContent string
|
|
if readErr == nil && len(content) > 0 {
|
|
newContent = "# Iris Autocomplete\n" + evalCmd + "\n\n" + string(content)
|
|
} else {
|
|
newContent = "# Iris Autocomplete\n" + evalCmd + "\n"
|
|
}
|
|
if mkdirErr := os.MkdirAll(filepath.Dir(configFile), 0755); mkdirErr != nil {
|
|
fmt.Printf("Failed to create directory for %s: %v\n", configFile, mkdirErr)
|
|
return
|
|
}
|
|
err = os.WriteFile(configFile, []byte(newContent), 0644)
|
|
if err != nil {
|
|
fmt.Printf("Failed to update %s: %v\n", configFile, err)
|
|
return
|
|
}
|
|
fmt.Printf("✓ Added iris integration to top of %s\n", configFile)
|
|
}
|
|
|
|
// initialize default config file if it does not exist
|
|
if path, err := config.ConfigPath(); err == nil {
|
|
if _, statErr := os.Stat(path); os.IsNotExist(statErr) {
|
|
_ = os.MkdirAll(filepath.Dir(path), 0755)
|
|
defaultContent := `# ~/.config/iris/config.toml
|
|
# iris configuration file
|
|
|
|
[core]
|
|
# schema version
|
|
# do not edit this field manually
|
|
version = 1
|
|
|
|
# override shell: "bash", "zsh", "fish", keep empty for auto detection
|
|
shell = ""
|
|
|
|
# startup mode: "last", "spec", "history"
|
|
# "last" = remember last mode used
|
|
mode = "last"
|
|
|
|
# enable debug logging
|
|
debug = false
|
|
|
|
# automatically expand aliases on space
|
|
expand-alias = true
|
|
|
|
[ui]
|
|
# visual style: "modern" (icons, category pills, shortcut footer) or "classic" (minimalist, centered number, no icons)
|
|
style = "modern"
|
|
|
|
# enable Nerd Fonts icons in overlay menu
|
|
nerd-fonts = true
|
|
|
|
# show hidden files with dot prefix
|
|
hidden-files = false
|
|
|
|
# enable inline ghost text
|
|
ghost-text = true
|
|
|
|
# maximum suggestions to display
|
|
max-suggestions = 100
|
|
|
|
# maximum height of the overlay
|
|
max-height = 15
|
|
|
|
[git]
|
|
# hide current branch in checkout/switch list
|
|
filter-active-branch = true
|
|
|
|
# merge remote and local branches with same name
|
|
deduplicate-branches = true
|
|
|
|
[updater]
|
|
# check for updates on startup
|
|
check-on-startup = true
|
|
|
|
# update channel: "stable", "nightly"
|
|
channel = "stable"
|
|
|
|
# interval between update checks, e.g. "24h", "6h", "30m"
|
|
check-interval = "24h"
|
|
|
|
[keybindings]
|
|
toggle_mode = "ctrl+r"
|
|
toggle_menu = "shift+tab"
|
|
select_suggestion = "tab"
|
|
accept_suggestion = "right"
|
|
`
|
|
if errWrite := os.WriteFile(path, []byte(defaultContent), 0644); errWrite == nil {
|
|
fmt.Printf("✓ Initialized default config file at %s\n", path)
|
|
}
|
|
}
|
|
}
|
|
|
|
fmt.Println("\nSetup complete! Please restart your terminal or run:")
|
|
fmt.Printf(" \033[32msource %s\033[0m\n", configFile)
|
|
},
|
|
}
|