Skip to content

Commit 178cc80

Browse files
author
Ira Abramov
committed
add ? to all color vars to quiet down SC2154
1 parent 93f2f35 commit 178cc80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+295
-294
lines changed

‎themes/atomic/atomic.theme.bash‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ function ___atomic_prompt_user_info() {
118118

119119
function ___atomic_prompt_dir() {
120120
local color="${IRed?}"
121-
local box="[|]${normal}"
121+
local box="[|]${normal?}"
122122
local info="\w"
123123
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
124124
}
@@ -276,8 +276,8 @@ RBFU_THEME_PROMPT_SUFFIX=""
276276
RVM_THEME_PROMPT_PREFIX=""
277277
RVM_THEME_PROMPT_SUFFIX=""
278278

279-
SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
280-
SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
279+
SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
280+
SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
281281

282282
: "${THEME_SHOW_SUDO:="true"}"
283283
: "${THEME_SHOW_SCM:="true"}"

‎themes/axin/axin.theme.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ function prompt_command() {
3333
PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]@ \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\[$SCM_THEME_PROMPT_PREFIX\]$(clock_prompt) \[$PURPLE\]$(scm_prompt_info) \n\$ \[$RESET\]"
3434
}
3535

36-
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${white}"}
36+
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${white?}"}
3737

3838
safe_append_prompt_command prompt_command

‎themes/bakke/bakke.theme.bash‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ RVM_THEME_PROMPT_PREFIX="|"
1515
RVM_THEME_PROMPT_SUFFIX="|"
1616

1717
function prompt_command() {
18-
#PS1="${bold_cyan}$(scm_char)${green}$(scm_prompt_info)${purple}$(ruby_version_prompt) ${yellow}\h ${reset_color}in ${green}\w ${reset_color}\n${green}→${reset_color} "
19-
#PS1="\n${purple}\h: ${reset_color} ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
20-
#PS1="\n${cyan}\h: ${reset_color} ${yellow}\w\n${red}$(scm_char)${red}$(scm_prompt_info) ${green}→${reset_color} "
18+
#PS1="${bold_cyan?}$(scm_char)${green?}$(scm_prompt_info)${purple?}$(ruby_version_prompt) ${yellow?}\h ${reset_color?}in ${green?}\w ${reset_color?}\n${green}→${reset_color?} "
19+
#PS1="\n${purple?}\h: ${reset_color?} ${green?}\w\n${bold_cyan?}$(scm_char)${green?}$(scm_prompt_info) ${green}→${reset_color?} "
20+
#PS1="\n${cyan?}\h: ${reset_color?} ${yellow?}\w\n${red?}$(scm_char)${red?}$(scm_prompt_info) ${green?}→${reset_color?} "
2121
local virtualenv_prompt scm_prompt_info
2222
virtualenv_prompt="$(virtualenv_prompt)"
2323
scm_prompt_info="$(scm_prompt_info)"

‎themes/barbuk/barbuk.theme.bash‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function __exit_prompt() {
8888
if [[ "$exit_code" -ne 0 ]]; then
8989
echo "${purple?}${EXIT_CODE_ICON}${yellow?}${exit_code}${bold_orange?} "
9090
else
91-
echo "${bold_green}"
91+
echo "${bold_green?}"
9292
fi
9393
}
9494

@@ -168,7 +168,7 @@ function __path_prompt() {
168168
dir_color=${red?}
169169
fi
170170

171-
echo "${dir_color}\w${normal} "
171+
echo "${dir_color}\w${normal?} "
172172
}
173173

174174
function __scm_prompt() {
@@ -197,7 +197,7 @@ function __prompt-command() {
197197
wrap_char="\n"
198198
fi
199199

200-
PS1="${PS1}${wrap_char}❯${normal} "
200+
PS1="${PS1}${wrap_char}❯${normal?} "
201201
}
202202

203203
safe_append_prompt_command __prompt-command

‎themes/binaryanomaly/binaryanomaly.theme.bash‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,17 @@ function prompt_command() {
5858
ps_reboot="${bright_yellow?}${show_reboot_required}${normal?}\n"
5959

6060
set_user_color="$(set_user_color)"
61-
ps_username="${set_user_color}\u${normal}"
62-
ps_uh_separator="${dark_grey?}@${normal}"
61+
ps_username="${set_user_color}\u${normal?}"
62+
ps_uh_separator="${dark_grey?}@${normal?}"
6363
set_host_color="$(set_host_color)"
64-
ps_hostname="${set_host_color}\h${normal}"
64+
ps_hostname="${set_host_color}\h${normal?}"
6565

66-
ps_path="${yellow?}\w${normal}"
66+
ps_path="${yellow?}\w${normal?}"
6767
scm_prompt="$(scm_prompt)"
6868
ps_scm_prompt="${light_grey?}${scm_prompt}"
6969

70-
ps_user_mark="${normal} ${normal}"
71-
ps_user_input="${normal}"
70+
ps_user_mark="${normal?} ${normal?}"
71+
ps_user_input="${normal?}"
7272

7373
# Set prompt
7474
ps_time="$(__ps_time)"

‎themes/brainy/brainy.theme.bash‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,67 +90,67 @@ ____brainy_bottom() {
9090
##############
9191

9292
___brainy_prompt_user_info() {
93-
color=$bold_blue
93+
color=${bold_blue?}
9494
if [ "${THEME_SHOW_SUDO}" == "true" ]; then
9595
if sudo -vn 1> /dev/null 2>&1; then
96-
color=$bold_red
96+
color=${bold_red?}
9797
fi
9898
fi
9999
box="[|]"
100100
info="\u@\H"
101101
if [ -n "${SSH_CLIENT}" ]; then
102-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
102+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
103103
else
104104
printf "%s|%s" "${color}" "${info}"
105105
fi
106106
}
107107

108108
___brainy_prompt_dir() {
109-
color=$bold_yellow
109+
color=${bold_yellow?}
110110
box="[|]"
111111
info="\w"
112-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
112+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
113113
}
114114

115115
___brainy_prompt_scm() {
116116
[ "${THEME_SHOW_SCM}" != "true" ] && return
117-
color=$bold_green
117+
color=${bold_green?}
118118
box="$(scm_char) "
119119
info="$(scm_prompt_info)"
120-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
120+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
121121
}
122122

123123
___brainy_prompt_python() {
124124
[ "${THEME_SHOW_PYTHON}" != "true" ] && return
125-
color=$bold_yellow
125+
color=${bold_yellow?}
126126
box="[|]"
127127
info="$(python_version_prompt)"
128-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue}" "${box}"
128+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue?}" "${box}"
129129
}
130130

131131
___brainy_prompt_ruby() {
132132
[ "${THEME_SHOW_RUBY}" != "true" ] && return
133-
color=$bold_white
133+
color=${bold_white?}
134134
box="[|]"
135135
info="rb-$(ruby_version_prompt)"
136-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red}" "${box}"
136+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red?}" "${box}"
137137
}
138138

139139
___brainy_prompt_todo() {
140140
[ "${THEME_SHOW_TODO}" != "true" ] \
141141
|| [ -z "$(which todo.sh)" ] && return
142-
color=$bold_white
142+
color=${bold_white?}
143143
box="[|]"
144144
info="t:$(todo.sh ls | grep -E "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }')"
145-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}"
145+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green?}" "${box}"
146146
}
147147

148148
___brainy_prompt_clock() {
149149
[ "${THEME_SHOW_CLOCK}" != "true" ] && return
150150
color=$THEME_CLOCK_COLOR
151151
box="[|]"
152152
info="$(date +"${THEME_CLOCK_FORMAT}")"
153-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_purple}" "${box}"
153+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_purple?}" "${box}"
154154
}
155155

156156
___brainy_prompt_battery() {
@@ -159,28 +159,28 @@ ___brainy_prompt_battery() {
159159
|| [ "$(battery_percentage)" = "no" ] && return
160160

161161
info=$(battery_percentage)
162-
color=$bold_green
162+
color=${bold_green?}
163163
if [ "$info" -lt 50 ]; then
164-
color=$bold_yellow
164+
color=${bold_yellow?}
165165
elif [ "$info" -lt 25 ]; then
166-
color=$bold_red
166+
color=${bold_red?}
167167
fi
168168
box="[|]"
169169
ac_adapter_connected && charging="+"
170170
ac_adapter_disconnected && charging="-"
171171
info+="$charging"
172172
[ "$info" == "100+" ] && info="AC"
173-
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
173+
printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
174174
}
175175

176176
___brainy_prompt_exitcode() {
177177
[ "${THEME_SHOW_EXITCODE}" != "true" ] && return
178-
color=$bold_purple
178+
color=${bold_purple?}
179179
[ "$exitcode" -ne 0 ] && printf "%s|%s" "${color}" "${exitcode}"
180180
}
181181

182182
___brainy_prompt_char() {
183-
color=$bold_white
183+
color=${bold_white?}
184184
prompt_char="${__BRAINY_PROMPT_CHAR_PS1}"
185185
printf "%s|%s" "${color}" "${prompt_char}"
186186
}
@@ -258,8 +258,8 @@ export RVM_THEME_PROMPT_SUFFIX=""
258258
export VIRTUALENV_THEME_PROMPT_PREFIX=""
259259
export VIRTUALENV_THEME_PROMPT_SUFFIX=""
260260

261-
export SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
262-
export SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
261+
export SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
262+
export SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
263263

264264
THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"}
265265
THEME_SHOW_SCM=${THEME_SHOW_SCM:-"true"}
@@ -270,7 +270,7 @@ THEME_SHOW_TODO=${THEME_SHOW_TODO:-"false"}
270270
THEME_SHOW_BATTERY=${THEME_SHOW_BATTERY:-"false"}
271271
THEME_SHOW_EXITCODE=${THEME_SHOW_EXITCODE:-"true"}
272272

273-
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$bold_white"}
273+
THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${bold_white?}"}
274274
THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
275275

276276
__BRAINY_PROMPT_CHAR_PS1=${THEME_PROMPT_CHAR_PS1:-">"}
@@ -285,12 +285,12 @@ ___BRAINY_BOTTOM=${___BRAINY_BOTTOM:-"exitcode char"}
285285
############
286286

287287
__brainy_ps1() {
288-
printf "%s%s%s" "$(____brainy_top)" "$(____brainy_bottom)" "${normal}"
288+
printf "%s%s%s" "$(____brainy_top)" "$(____brainy_bottom)" "${normal?}"
289289
}
290290

291291
__brainy_ps2() {
292-
color=$bold_white
293-
printf "%s%s%s" "${color}" "${__BRAINY_PROMPT_CHAR_PS2} " "${normal}"
292+
color=${bold_white?}
293+
printf "%s%s%s" "${color}" "${__BRAINY_PROMPT_CHAR_PS2} " "${normal?}"
294294
}
295295

296296
_brainy_prompt() {

‎themes/clean/clean.theme.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function prompt_command() {
1818
no_color=${white?}
1919
fi
2020

21-
PS1="${no_color}\u${reset_color}:${blue?}\W/${reset_color} $(scm_prompt_info)${normal?}$ "
21+
PS1="${no_color}\u${reset_color?}:${blue?}\W/${reset_color?} $(scm_prompt_info)${normal?}$ "
2222
}
2323

2424
safe_append_prompt_command prompt_command

‎themes/doubletime/doubletime.theme.bash‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,38 @@
33

44
SCM_THEME_PROMPT_DIRTY=''
55
SCM_THEME_PROMPT_CLEAN=''
6-
SCM_GIT_CHAR="${bold_cyan}±${normal}"
7-
SCM_SVN_CHAR="${bold_cyan}⑆${normal}"
8-
SCM_HG_CHAR="${bold_red}☿${normal}"
6+
SCM_GIT_CHAR="${bold_cyan?}±${normal?}"
7+
SCM_SVN_CHAR="${bold_cyan?}⑆${normal?}"
8+
SCM_HG_CHAR="${bold_red?}☿${normal?}"
99
SCM_THEME_PROMPT_PREFIX=""
1010
SCM_THEME_PROMPT_SUFFIX=""
1111
if [[ -n "$RVM_THEME_PROMPT_COLOR" ]]; then
1212
RVM_THEME_PROMPT_COLOR=$(eval "echo $$(echo ${RVM_THEME_PROMPT_COLOR})")
1313
else
14-
RVM_THEME_PROMPT_COLOR="${red}"
14+
RVM_THEME_PROMPT_COLOR="${red?}"
1515
fi
16-
RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${normal}: "
16+
RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${normal?}: "
1717
RVM_THEME_PROMPT_SUFFIX=") "
1818
if [[ -n "$VIRTUALENV_THEME_PROMPT_COLOR" ]]; then
1919
VIRTUALENV_THEME_PROMPT_COLOR=$(eval "echo $$(echo ${VIRTUALENV_THEME_PROMPT_COLOR})")
2020
else
21-
VIRTUALENV_THEME_PROMPT_COLOR="${green}"
21+
VIRTUALENV_THEME_PROMPT_COLOR="${green?}"
2222
fi
23-
VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${normal}: "
23+
VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${normal?}: "
2424
VIRTUALENV_THEME_PROMPT_SUFFIX=") "
2525

2626
if [[ -n "$THEME_PROMPT_HOST_COLOR" ]]; then
2727
THEME_PROMPT_HOST_COLOR=$(eval "echo $$(echo ${THEME_PROMPT_HOST_COLOR})")
2828
else
29-
THEME_PROMPT_HOST_COLOR="$blue"
29+
THEME_PROMPT_HOST_COLOR="${blue?}"
3030
fi
3131

3232
function prompt_setter() {
3333
# Save history
3434
_save-and-reload-history 1
3535
PS1="
36-
$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(ruby_version_prompt)\w
37-
$(scm_prompt)$reset_color $ "
36+
$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)$(ruby_version_prompt)\w
37+
$(scm_prompt)${reset_color?} $ "
3838
PS2='> '
3939
PS4='+ '
4040
}

‎themes/doubletime_multiline/doubletime_multiline.theme.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function prompt_setter() {
99
PS1="
1010
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)$(ruby_version_prompt)
1111
\w
12-
$(scm_prompt)$reset_color $ "
12+
$(scm_prompt)${reset_color?} $ "
1313
PS2='> '
1414
PS4='+ '
1515
}

‎themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function prompt_setter() {
99
PS1="
1010
$(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)
1111
\w
12-
$(scm_prompt)$reset_color $ "
12+
$(scm_prompt)${reset_color?} $ "
1313
PS2='> '
1414
PS4='+ '
1515
}

0 commit comments

Comments
 (0)