All themes cleaned up

clean_files.txt

@@ -25,6 +25,7 @@ plugins/
 scripts/
 template/
 test/
+themes/
 
 # root files
 #
@@ -35,60 +36,6 @@ install.sh
 lint_clean_files.sh
 uninstall.sh
 
-# themes
-#
-themes/90210
-themes/agnoster
-themes/atomic
-themes/axin
-themes/bakke
-themes/barbuk
-themes/binaryanomaly
-themes/bira
-themes/bobby
-themes/bobby-python
-themes/brainy
-themes/brunton
-themes/candy
-themes/clean
-themes/codeword
-themes/cooperkid
-themes/cupcake
-themes/demula
-themes/dos
-themes/doubletime
-themes/doubletime_multiline
-themes/doubletime_multiline_pyonly
-themes/dulcie
-themes/duru
-themes/easy
-themes/elixr
-themes/emperor
-themes/envy
-themes/essential
-themes/font
-themes/gallifrey
-themes/gitline
-themes/hawaii50
-themes/inretio
-themes/iterate
-themes/kitsune
-themes/lambda
-themes/liquidprompt
-themes/luan
-themes/modern
-themes/norbu
-themes/oh-my-posh
-themes/p4helpers.theme.bash
-themes/pete
-themes/powerline
-themes/powerline-multiline
-themes/powerline-naked
-themes/pure
-themes/purity
-themes/rjorgenson
-themes/robbyrussell
-
 # vendor init files
 #
 vendor/.gitattributes

themes/atomic/atomic.theme.bash

@@ -118,7 +118,7 @@ function ___atomic_prompt_user_info() {
 
 function ___atomic_prompt_dir() {
 	local color="${IRed?}"
-	local box="[|]${normal}"
+	local box="[|]${normal?}"
 	local info="\w"
 	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
 }
@@ -276,8 +276,8 @@ RBFU_THEME_PROMPT_SUFFIX=""
 RVM_THEME_PROMPT_PREFIX=""
 RVM_THEME_PROMPT_SUFFIX=""
 
-SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
-SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
+SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
+SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
 
 : "${THEME_SHOW_SUDO:="true"}"
 : "${THEME_SHOW_SCM:="true"}"

themes/axin/axin.theme.bash

@@ -33,6 +33,6 @@ function prompt_command() {
 	PS1="\[${BOLD}${MAGENTA}\]\u \[$WHITE\]@ \[$ORANGE\]\h \[$WHITE\]in \[$GREEN\]\w\[$WHITE\]\[$SCM_THEME_PROMPT_PREFIX\]$(clock_prompt) \[$PURPLE\]$(scm_prompt_info) \n\$ \[$RESET\]"
 }
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${white}"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${white?}"}
 
 safe_append_prompt_command prompt_command

themes/bakke/bakke.theme.bash

@@ -15,9 +15,9 @@ RVM_THEME_PROMPT_PREFIX="|"
 RVM_THEME_PROMPT_SUFFIX="|"
 
 function prompt_command() {
-	#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} "
-	#PS1="\n${purple}\h: ${reset_color} ${green}\w\n${bold_cyan}$(scm_char)${green}$(scm_prompt_info) ${green}→${reset_color} "
-	#PS1="\n${cyan}\h: ${reset_color} ${yellow}\w\n${red}$(scm_char)${red}$(scm_prompt_info) ${green}→${reset_color} "
+	#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?} "
+	#PS1="\n${purple?}\h: ${reset_color?} ${green?}\w\n${bold_cyan?}$(scm_char)${green?}$(scm_prompt_info) ${green}→${reset_color?} "
+	#PS1="\n${cyan?}\h: ${reset_color?} ${yellow?}\w\n${red?}$(scm_char)${red?}$(scm_prompt_info) ${green?}→${reset_color?} "
 	local virtualenv_prompt scm_prompt_info
 	virtualenv_prompt="$(virtualenv_prompt)"
 	scm_prompt_info="$(scm_prompt_info)"

themes/barbuk/barbuk.theme.bash

@@ -88,7 +88,7 @@ function __exit_prompt() {
 	if [[ "$exit_code" -ne 0 ]]; then
 		echo "${purple?}${EXIT_CODE_ICON}${yellow?}${exit_code}${bold_orange?} "
 	else
-		echo "${bold_green}"
+		echo "${bold_green?}"
 	fi
 }
 
@@ -168,7 +168,7 @@ function __path_prompt() {
 		dir_color=${red?}
 	fi
 
-	echo "${dir_color}\w${normal} "
+	echo "${dir_color}\w${normal?} "
 }
 
 function __scm_prompt() {
@@ -197,7 +197,7 @@ function __prompt-command() {
 		wrap_char="\n"
 	fi
 
-	PS1="${PS1}${wrap_char}❯${normal} "
+	PS1="${PS1}${wrap_char}❯${normal?} "
 }
 
 safe_append_prompt_command __prompt-command

themes/binaryanomaly/binaryanomaly.theme.bash

@@ -58,17 +58,17 @@ function prompt_command() {
 	ps_reboot="${bright_yellow?}${show_reboot_required}${normal?}\n"
 
 	set_user_color="$(set_user_color)"
-	ps_username="${set_user_color}\u${normal}"
-	ps_uh_separator="${dark_grey?}@${normal}"
+	ps_username="${set_user_color}\u${normal?}"
+	ps_uh_separator="${dark_grey?}@${normal?}"
 	set_host_color="$(set_host_color)"
-	ps_hostname="${set_host_color}\h${normal}"
+	ps_hostname="${set_host_color}\h${normal?}"
 
-	ps_path="${yellow?}\w${normal}"
+	ps_path="${yellow?}\w${normal?}"
 	scm_prompt="$(scm_prompt)"
 	ps_scm_prompt="${light_grey?}${scm_prompt}"
 
-	ps_user_mark="${normal} ${normal}"
-	ps_user_input="${normal}"
+	ps_user_mark="${normal?} ${normal?}"
+	ps_user_input="${normal?}"
 
 	# Set prompt
 	ps_time="$(__ps_time)"

themes/brainy/brainy.theme.bash

@@ -90,67 +90,67 @@ ____brainy_bottom() {
 ##############
 
 ___brainy_prompt_user_info() {
-	color=$bold_blue
+	color=${bold_blue?}
 	if [ "${THEME_SHOW_SUDO}" == "true" ]; then
 		if sudo -vn 1> /dev/null 2>&1; then
-			color=$bold_red
+			color=${bold_red?}
 		fi
 	fi
 	box="[|]"
 	info="\u@\H"
 	if [ -n "${SSH_CLIENT}" ]; then
-		printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
+		printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
 	else
 		printf "%s|%s" "${color}" "${info}"
 	fi
 }
 
 ___brainy_prompt_dir() {
-	color=$bold_yellow
+	color=${bold_yellow?}
 	box="[|]"
 	info="\w"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
 }
 
 ___brainy_prompt_scm() {
 	[ "${THEME_SHOW_SCM}" != "true" ] && return
-	color=$bold_green
+	color=${bold_green?}
 	box="$(scm_char) "
 	info="$(scm_prompt_info)"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
 }
 
 ___brainy_prompt_python() {
 	[ "${THEME_SHOW_PYTHON}" != "true" ] && return
-	color=$bold_yellow
+	color=${bold_yellow?}
 	box="[|]"
 	info="$(python_version_prompt)"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_blue?}" "${box}"
 }
 
 ___brainy_prompt_ruby() {
 	[ "${THEME_SHOW_RUBY}" != "true" ] && return
-	color=$bold_white
+	color=${bold_white?}
 	box="[|]"
 	info="rb-$(ruby_version_prompt)"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_red?}" "${box}"
 }
 
 ___brainy_prompt_todo() {
 	[ "${THEME_SHOW_TODO}" != "true" ] \
 		|| [ -z "$(which todo.sh)" ] && return
-	color=$bold_white
+	color=${bold_white?}
 	box="[|]"
 	info="t:$(todo.sh ls | grep -E "TODO: [0-9]+ of ([0-9]+)" | awk '{ print $4 }')"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_green?}" "${box}"
 }
 
 ___brainy_prompt_clock() {
 	[ "${THEME_SHOW_CLOCK}" != "true" ] && return
 	color=$THEME_CLOCK_COLOR
 	box="[|]"
 	info="$(date +"${THEME_CLOCK_FORMAT}")"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_purple}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_purple?}" "${box}"
 }
 
 ___brainy_prompt_battery() {
@@ -159,28 +159,28 @@ ___brainy_prompt_battery() {
 		|| [ "$(battery_percentage)" = "no" ] && return
 
 	info=$(battery_percentage)
-	color=$bold_green
+	color=${bold_green?}
 	if [ "$info" -lt 50 ]; then
-		color=$bold_yellow
+		color=${bold_yellow?}
 	elif [ "$info" -lt 25 ]; then
-		color=$bold_red
+		color=${bold_red?}
 	fi
 	box="[|]"
 	ac_adapter_connected && charging="+"
 	ac_adapter_disconnected && charging="-"
 	info+="$charging"
 	[ "$info" == "100+" ] && info="AC"
-	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white}" "${box}"
+	printf "%s|%s|%s|%s" "${color}" "${info}" "${bold_white?}" "${box}"
 }
 
 ___brainy_prompt_exitcode() {
 	[ "${THEME_SHOW_EXITCODE}" != "true" ] && return
-	color=$bold_purple
+	color=${bold_purple?}
 	[ "$exitcode" -ne 0 ] && printf "%s|%s" "${color}" "${exitcode}"
 }
 
 ___brainy_prompt_char() {
-	color=$bold_white
+	color=${bold_white?}
 	prompt_char="${__BRAINY_PROMPT_CHAR_PS1}"
 	printf "%s|%s" "${color}" "${prompt_char}"
 }
@@ -258,8 +258,8 @@ export RVM_THEME_PROMPT_SUFFIX=""
 export VIRTUALENV_THEME_PROMPT_PREFIX=""
 export VIRTUALENV_THEME_PROMPT_SUFFIX=""
 
-export SCM_THEME_PROMPT_DIRTY=" ${bold_red}✗${normal}"
-export SCM_THEME_PROMPT_CLEAN=" ${bold_green}✓${normal}"
+export SCM_THEME_PROMPT_DIRTY=" ${bold_red?}✗${normal?}"
+export SCM_THEME_PROMPT_CLEAN=" ${bold_green?}✓${normal?}"
 
 THEME_SHOW_SUDO=${THEME_SHOW_SUDO:-"true"}
 THEME_SHOW_SCM=${THEME_SHOW_SCM:-"true"}
@@ -270,7 +270,7 @@ THEME_SHOW_TODO=${THEME_SHOW_TODO:-"false"}
 THEME_SHOW_BATTERY=${THEME_SHOW_BATTERY:-"false"}
 THEME_SHOW_EXITCODE=${THEME_SHOW_EXITCODE:-"true"}
 
-THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"$bold_white"}
+THEME_CLOCK_COLOR=${THEME_CLOCK_COLOR:-"${bold_white?}"}
 THEME_CLOCK_FORMAT=${THEME_CLOCK_FORMAT:-"%H:%M:%S"}
 
 __BRAINY_PROMPT_CHAR_PS1=${THEME_PROMPT_CHAR_PS1:-">"}
@@ -285,12 +285,12 @@ ___BRAINY_BOTTOM=${___BRAINY_BOTTOM:-"exitcode char"}
 ############
 
 __brainy_ps1() {
-	printf "%s%s%s" "$(____brainy_top)" "$(____brainy_bottom)" "${normal}"
+	printf "%s%s%s" "$(____brainy_top)" "$(____brainy_bottom)" "${normal?}"
 }
 
 __brainy_ps2() {
-	color=$bold_white
-	printf "%s%s%s" "${color}" "${__BRAINY_PROMPT_CHAR_PS2}  " "${normal}"
+	color=${bold_white?}
+	printf "%s%s%s" "${color}" "${__BRAINY_PROMPT_CHAR_PS2}  " "${normal?}"
 }
 
 _brainy_prompt() {

themes/clean/clean.theme.bash

@@ -12,13 +12,14 @@ export LSCOLORS="Gxfxcxdxbxegedabagacad"
 export LS_COLORS='no=00:fi=00:di=01;34:ln=00;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=41;33;01:ex=00;32:*.cmd=00;32:*.exe=01;32:*.com=01;32:*.bat=01;32:*.btm=01;32:*.dll=01;32:*.tar=00;31:*.tbz=00;31:*.tgz=00;31:*.rpm=00;31:*.deb=00;31:*.arj=00;31:*.taz=00;31:*.lzh=00;31:*.lzma=00;31:*.zip=00;31:*.zoo=00;31:*.z=00;31:*.Z=00;31:*.gz=00;31:*.bz2=00;31:*.tb2=00;31:*.tz2=00;31:*.tbz2=00;31:*.avi=01;35:*.bmp=01;35:*.fli=01;35:*.gif=01;35:*.jpg=01;35:*.jpeg=01;35:*.mng=01;35:*.mov=01;35:*.mpg=01;35:*.pcx=01;35:*.pbm=01;35:*.pgm=01;35:*.png=01;35:*.ppm=01;35:*.tga=01;35:*.tif=01;35:*.xbm=01;35:*.xpm=01;35:*.dl=01;35:*.gl=01;35:*.wmv=01;35:*.aiff=00;32:*.au=00;32:*.mid=00;32:*.mp3=00;32:*.ogg=00;32:*.voc=00;32:*.wav=00;32:'
 
 function prompt_command() {
+	local no_color
 	if [ "$(whoami)" = root ]; then
 		no_color=${red?}
 	else
 		no_color=${white?}
 	fi
 
-	PS1="${no_color}\u${reset_color}:${blue?}\W/${reset_color} $(scm_prompt_info)${normal?}$ "
+	PS1="${no_color}\u${reset_color?}:${blue?}\W/${reset_color?} $(scm_prompt_info)${normal?}$ "
 }
 
 safe_append_prompt_command prompt_command

themes/doubletime/doubletime.theme.bash

@@ -3,38 +3,38 @@
 
 SCM_THEME_PROMPT_DIRTY=''
 SCM_THEME_PROMPT_CLEAN=''
-SCM_GIT_CHAR="${bold_cyan}±${normal}"
-SCM_SVN_CHAR="${bold_cyan}⑆${normal}"
-SCM_HG_CHAR="${bold_red}☿${normal}"
+SCM_GIT_CHAR="${bold_cyan?}±${normal?}"
+SCM_SVN_CHAR="${bold_cyan?}⑆${normal?}"
+SCM_HG_CHAR="${bold_red?}☿${normal?}"
 SCM_THEME_PROMPT_PREFIX=""
 SCM_THEME_PROMPT_SUFFIX=""
 if [[ -n "$RVM_THEME_PROMPT_COLOR" ]]; then
 	RVM_THEME_PROMPT_COLOR=$(eval "echo $$(echo ${RVM_THEME_PROMPT_COLOR})")
 else
-	RVM_THEME_PROMPT_COLOR="${red}"
+	RVM_THEME_PROMPT_COLOR="${red?}"
 fi
-RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${normal}: "
+RVM_THEME_PROMPT_PREFIX="(${RVM_THEME_PROMPT_COLOR}rb${normal?}: "
 RVM_THEME_PROMPT_SUFFIX=") "
 if [[ -n "$VIRTUALENV_THEME_PROMPT_COLOR" ]]; then
 	VIRTUALENV_THEME_PROMPT_COLOR=$(eval "echo $$(echo ${VIRTUALENV_THEME_PROMPT_COLOR})")
 else
-	VIRTUALENV_THEME_PROMPT_COLOR="${green}"
+	VIRTUALENV_THEME_PROMPT_COLOR="${green?}"
 fi
-VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${normal}: "
+VIRTUALENV_THEME_PROMPT_PREFIX="(${VIRTUALENV_THEME_PROMPT_COLOR}py${normal?}: "
 VIRTUALENV_THEME_PROMPT_SUFFIX=") "
 
 if [[ -n "$THEME_PROMPT_HOST_COLOR" ]]; then
 	THEME_PROMPT_HOST_COLOR=$(eval "echo $$(echo ${THEME_PROMPT_HOST_COLOR})")
 else
-	THEME_PROMPT_HOST_COLOR="$blue"
+	THEME_PROMPT_HOST_COLOR="${blue?}"
 fi
 
 function prompt_setter() {
 	# Save history
 	_save-and-reload-history 1
 	PS1="
-$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}$reset_color] $(virtualenv_prompt)$(ruby_version_prompt)\w
-$(scm_prompt)$reset_color $ "
+$(clock_prompt) $(scm_char) [${THEME_PROMPT_HOST_COLOR}\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)$(ruby_version_prompt)\w
+$(scm_prompt)${reset_color?} $ "
 	PS2='> '
 	PS4='+ '
 }

themes/doubletime_multiline/doubletime_multiline.theme.bash

@@ -9,7 +9,7 @@ function prompt_setter() {
 	PS1="
 $(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)$(ruby_version_prompt)
 \w
-$(scm_prompt)$reset_color $ "
+$(scm_prompt)${reset_color?} $ "
 	PS2='> '
 	PS4='+ '
 }

themes/doubletime_multiline_pyonly/doubletime_multiline_pyonly.theme.bash

@@ -9,7 +9,7 @@ function prompt_setter() {
 	PS1="
 $(clock_prompt) $(scm_char) [$THEME_PROMPT_HOST_COLOR\u@${THEME_PROMPT_HOST}${reset_color?}] $(virtualenv_prompt)
 \w
-$(scm_prompt)$reset_color $ "
+$(scm_prompt)${reset_color?} $ "
 	PS2='> '
 	PS4='+ '
 }