Skip to content

fix(zsh): resolve shellcheck parse errors in dot_zshrc.tmpl #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(zsh): resolve shellcheck parse errors in dot_zshrc.tmpl #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions dot_zshrc.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@ function zle-keymap-select {
zle reset-prompt
}
zle -N zle-keymap-select
function zle-line-init { print -n '\e[6 q' }
# Use POSIX-style function syntax so shellcheck's sh parser accepts the
# rendered zshrc while keeping the definition valid zsh.
zle-line-init() {
print -n '\e[6 q'
}
zle -N zle-line-init

## Env Vars
Expand Down Expand Up @@ -82,21 +86,21 @@ fi
# whenever atuin is reachable from either path. (Replaces the old OS
# branch, whose Linux half skipped env and silently no-oped on a
# curl-only install with atuin not yet on PATH.)
if [[ -f $HOME/.atuin/bin/env ]] then
if [[ -f $HOME/.atuin/bin/env ]]; then
. "$HOME/.atuin/bin/env"
fi
if [[ $(command -v atuin) ]] then
if [[ $(command -v atuin) ]]; then
eval "$(atuin init zsh)"
eval "$(atuin gen-completions --shell zsh)"
fi

# Starship: Cross-Shell Prompt (https://starship.rs/)
if [[ $(command -v starship) ]] then
if [[ $(command -v starship) ]]; then
# You may still need to add this at the end of .zshrc for it to work
eval "$(starship init zsh)"
fi

if [[ $(command -v thefuck) ]] then
if [[ $(command -v thefuck) ]]; then
eval "$(thefuck --alias)"
fi

Expand Down Expand Up @@ -137,17 +141,17 @@ fpath=($HOME/.zsh/completions $fpath)

# Added by Factory Desktop
{{ if eq .chezmoi.os "darwin" -}}
if [[ -d "/Applications/Factory.app" ]] then
if [[ -d "/Applications/Factory.app" ]]; then
export PATH="$HOME/.local/bin:$PATH"
fi
{{- else -}}
if [[ $(command -v factory) ]] then
if [[ $(command -v factory) ]]; then
export PATH="$HOME/.local/bin:$PATH"
fi
{{- end }}

# LM Studio CLI (lms): only add to PATH if installed
if [[ -d "$HOME/.lmstudio/bin" ]] then
if [[ -d "$HOME/.lmstudio/bin" ]]; then
export PATH="$PATH:$HOME/.lmstudio/bin"
fi

Expand Down