batipanel 0.4.14 → 0.4.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/VERSION +1 -1
- package/lib/shell-setup.sh +13 -22
- package/package.json +1 -1
package/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.4.
|
|
1
|
+
0.4.15
|
package/lib/shell-setup.sh
CHANGED
|
@@ -61,7 +61,7 @@ _generate_zsh_prompt() {
|
|
|
61
61
|
mkdir -p "$BATIPANEL_HOME/config"
|
|
62
62
|
|
|
63
63
|
cat > "$prompt_file" << 'ZSH_PROMPT_EOF'
|
|
64
|
-
# batipanel zsh prompt
|
|
64
|
+
# batipanel zsh prompt (no Oh My Zsh needed)
|
|
65
65
|
# This file is sourced from .zshrc
|
|
66
66
|
|
|
67
67
|
# enable colors
|
|
@@ -70,7 +70,7 @@ autoload -U colors && colors
|
|
|
70
70
|
# enable git info
|
|
71
71
|
autoload -Uz vcs_info
|
|
72
72
|
precmd() { vcs_info }
|
|
73
|
-
zstyle ':vcs_info:git:*' formats ' %F{black}%K{green}
|
|
73
|
+
zstyle ':vcs_info:git:*' formats ' %F{black}%K{green} ⎇ %b %k%F{green}▸%f'
|
|
74
74
|
zstyle ':vcs_info:*' enable git
|
|
75
75
|
|
|
76
76
|
# enable prompt substitution
|
|
@@ -83,9 +83,9 @@ if [[ "$TERM" != "dumb" ]]; then
|
|
|
83
83
|
printf '\e]12;#f5e0dc\a' # cursor: pink
|
|
84
84
|
fi
|
|
85
85
|
|
|
86
|
-
#
|
|
87
|
-
PROMPT='%K{blue}%F{white} %n %f%k%F{blue}%K{240}
|
|
88
|
-
RPROMPT='%(?..%F{red}
|
|
86
|
+
# prompt: user > directory > git branch
|
|
87
|
+
PROMPT='%K{blue}%F{white} %n %f%k%F{blue}%K{240}▸%f%F{white} %~ %f%k%F{240}${vcs_info_msg_0_:-%F{240}▸}%f '
|
|
88
|
+
RPROMPT='%(?..%F{red}✘ %?%f)'
|
|
89
89
|
ZSH_PROMPT_EOF
|
|
90
90
|
}
|
|
91
91
|
|
|
@@ -134,40 +134,31 @@ fi
|
|
|
134
134
|
|
|
135
135
|
__batipanel_prompt() {
|
|
136
136
|
local exit_code=$?
|
|
137
|
-
local sep=$'\uE0B0'
|
|
138
137
|
local bg_user="\[\e[44m\]"
|
|
139
138
|
local fg_user="\[\e[97m\]"
|
|
140
139
|
local bg_dir="\[\e[48;5;240m\]"
|
|
141
140
|
local fg_dir="\[\e[97m\]"
|
|
142
141
|
local bg_git="\[\e[42m\]"
|
|
143
142
|
local fg_git="\[\e[30m\]"
|
|
144
|
-
local bg_err="\[\e[41m\]"
|
|
145
|
-
local fg_err="\[\e[97m\]"
|
|
146
143
|
local reset="\[\e[0m\]"
|
|
147
|
-
local
|
|
148
|
-
local
|
|
149
|
-
local
|
|
150
|
-
local
|
|
151
|
-
local t_err_dir="\[\e[31;48;5;240m\]"
|
|
144
|
+
local t_user="\[\e[34;48;5;240m\]"
|
|
145
|
+
local t_dir="\[\e[38;5;240;42m\]"
|
|
146
|
+
local t_end="\[\e[38;5;240m\]"
|
|
147
|
+
local t_git="\[\e[32m\]"
|
|
152
148
|
local ps=""
|
|
153
149
|
if [ "$exit_code" -ne 0 ]; then
|
|
154
|
-
ps+="
|
|
155
|
-
ps+="${t_err_dir}${sep}"
|
|
150
|
+
ps+="\[\e[41m\]\[\e[97m\] ✘ ${exit_code} \[\e[31;48;5;240m\]▸"
|
|
156
151
|
fi
|
|
157
|
-
ps+="${bg_user}${fg_user} \\u "
|
|
158
|
-
ps+="${t_user_dir}${sep}"
|
|
152
|
+
ps+="${bg_user}${fg_user} \\u ${t_user}▸"
|
|
159
153
|
ps+="${bg_dir}${fg_dir} \\w "
|
|
160
154
|
local git_branch=""
|
|
161
155
|
if command -v git &>/dev/null; then
|
|
162
156
|
git_branch="$(git symbolic-ref --short HEAD 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)"
|
|
163
157
|
fi
|
|
164
158
|
if [ -n "$git_branch" ]; then
|
|
165
|
-
ps+="${
|
|
166
|
-
local git_icon=$'\uE0A0'
|
|
167
|
-
ps+="${bg_git}${fg_git} ${git_icon} ${git_branch} "
|
|
168
|
-
ps+="${reset}${t_git_end}${sep}${reset} "
|
|
159
|
+
ps+="${t_dir}▸${bg_git}${fg_git} ⎇ ${git_branch} ${reset}${t_git}▸${reset} "
|
|
169
160
|
else
|
|
170
|
-
ps+="${reset}${
|
|
161
|
+
ps+="${reset}${t_end}▸${reset} "
|
|
171
162
|
fi
|
|
172
163
|
PS1="$ps"
|
|
173
164
|
}
|
package/package.json
CHANGED