From 35cc6109fd1f415d034e1912b41b623be9aa84ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Mengu=C3=A9?= Date: Tue, 21 Aug 2012 07:07:34 +0200 Subject: [PATCH] Refactor config loading: step 3 (indent) Indent (separate commit just for readability of the step). --- liquidprompt | 124 +++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/liquidprompt b/liquidprompt index 0fab166..1142f80 100755 --- a/liquidprompt +++ b/liquidprompt @@ -167,73 +167,73 @@ esac _lp_source_config() { -# Note: configuration is called _after_ colors declarations, because of themes. + # Note: configuration is called _after_ colors declarations, because of themes. -# Default values -LP_BATTERY_THRESHOLD=${LP_BATTERY_THRESHOLD:-75} -LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60} -LP_PATH_LENGTH=${LP_PATH_LENGTH:-35} -LP_PATH_KEEP=${LP_PATH_KEEP:-2} -LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0} -LP_PS1=${LP_PS1:-""} + # Default values + LP_BATTERY_THRESHOLD=${LP_BATTERY_THRESHOLD:-75} + LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60} + LP_PATH_LENGTH=${LP_PATH_LENGTH:-35} + LP_PATH_KEEP=${LP_PATH_KEEP:-2} + LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0} + LP_PS1=${LP_PS1:-""} -LP_ENABLE_PERM=${LP_ENABLE_PERM:-1} -LP_ENABLE_SHORTEN_PATH=${LP_ENABLE_SHORTEN_PATH:-1} -LP_ENABLE_PROXY=${LP_ENABLE_PROXY:-1} -LP_ENABLE_JOBS=${LP_ENABLE_JOBS:-1} -LP_ENABLE_LOAD=${LP_ENABLE_LOAD:-1} -LP_ENABLE_BATT=${LP_ENABLE_BATT:-1} -LP_ENABLE_GIT=${LP_ENABLE_GIT:-1} -LP_ENABLE_SVN=${LP_ENABLE_SVN:-1} -LP_ENABLE_HG=${LP_ENABLE_HG:-1} -LP_ENABLE_TIME=${LP_ENABLE_TIME:-0} + LP_ENABLE_PERM=${LP_ENABLE_PERM:-1} + LP_ENABLE_SHORTEN_PATH=${LP_ENABLE_SHORTEN_PATH:-1} + LP_ENABLE_PROXY=${LP_ENABLE_PROXY:-1} + LP_ENABLE_JOBS=${LP_ENABLE_JOBS:-1} + LP_ENABLE_LOAD=${LP_ENABLE_LOAD:-1} + LP_ENABLE_BATT=${LP_ENABLE_BATT:-1} + LP_ENABLE_GIT=${LP_ENABLE_GIT:-1} + LP_ENABLE_SVN=${LP_ENABLE_SVN:-1} + LP_ENABLE_HG=${LP_ENABLE_HG:-1} + LP_ENABLE_TIME=${LP_ENABLE_TIME:-0} -LP_MARK_BATTERY=${LP_MARK_BATTERY:-"⌁"} -LP_MARK_ADAPTER=${LP_MARK_ADAPTER:-"⏚"} -LP_MARK_LOAD=${LP_MARK_LOAD:-"⌂"} -LP_MARK_PROXY=${LP_MARK_PROXY:-"↥"} -LP_MARK_HG=${LP_MARK_HG:-"☿"} -LP_MARK_SVN=${LP_MARK_SVN:-"‡"} -LP_MARK_GIT=${LP_MARK_GIT:-"±"} -LP_MARK_UNTRACKED=${LP_MARK_UNTRACKED:-"*"} + LP_MARK_BATTERY=${LP_MARK_BATTERY:-"⌁"} + LP_MARK_ADAPTER=${LP_MARK_ADAPTER:-"⏚"} + LP_MARK_LOAD=${LP_MARK_LOAD:-"⌂"} + LP_MARK_PROXY=${LP_MARK_PROXY:-"↥"} + LP_MARK_HG=${LP_MARK_HG:-"☿"} + LP_MARK_SVN=${LP_MARK_SVN:-"‡"} + LP_MARK_GIT=${LP_MARK_GIT:-"±"} + LP_MARK_UNTRACKED=${LP_MARK_UNTRACKED:-"*"} -LP_COLOR_PATH=${LP_COLOR_PATH:-$BOLD_WHITE} -LP_COLOR_PATH_ROOT=${LP_COLOR_PATH_ROOT:-$BOLD_YELLOW} -LP_COLOR_PROXY=${LP_COLOR_PROXY:-$BOLD_BLUE} -LP_COLOR_JOB_D=${LP_COLOR_JOB_D:-$YELLOW} -LP_COLOR_JOB_R=${LP_COLOR_JOB_R:-$BOLD_YELLOW} -LP_COLOR_JOB_Z=${LP_COLOR_JOB_Z:-$BOLD_YELLOW} -LP_COLOR_ERR=${LP_COLOR_ERR:-$PURPLE} -LP_COLOR_MARK=${LP_COLOR_MARK:-$BOLD_WHITE} -LP_COLOR_MARK_ROOT=${LP_COLOR_MARK_ROOT:-$BOLD_RED} -LP_COLOR_USER_LOGGED=${LP_COLOR_USER_LOGGED:-""} -LP_COLOR_USER_ALT=${LP_COLOR_USER_ALT:-$BOLD} -LP_COLOR_USER_ROOT=${_ROOT:-$BOLD_YELLOW} -LP_COLOR_HOST=${LP_COLOR_HOST:-""} -LP_COLOR_SSH=${LP_COLOR_SSH:-$BOLD_CYAN} -LP_COLOR_TELNET=${LP_COLOR_TELNET:-$WARN_RED} -LP_COLOR_WRITE=${LP_COLOR_WRITE:-$GREEN} -LP_COLOR_NOWRITE=${LP_COLOR_NOWRITE:-$RED} -LP_COLOR_UP=${LP_COLOR_UP:-$GREEN} -LP_COLOR_COMMITS=${LP_COLOR_COMMITS:-$YELLOW} -LP_COLOR_CHANGES=${LP_COLOR_CHANGES:-$RED} -LP_COLOR_DIFF=${LP_COLOR_DIFF:-$PURPLE} -LP_COLOR_CHARGING_ABOVE=${LP_COLOR_CHARGING_ABOVE:-$GREEN} -LP_COLOR_CHARGING_UNDER=${LP_COLOR_CHARGING_UNDER:-$YELLOW} -LP_COLOR_DISCHARGING_ABOVE=${LP_COLOR_DISCHARGING_ABOVE:-$YELLOW} -LP_COLOR_DISCHARGING_UNDER=${LP_COLOR_DISCHARGING_UNDER:-$RED} -LP_COLOR_TIME=${LP_COLOR_TIME:-$BLUE} + LP_COLOR_PATH=${LP_COLOR_PATH:-$BOLD_WHITE} + LP_COLOR_PATH_ROOT=${LP_COLOR_PATH_ROOT:-$BOLD_YELLOW} + LP_COLOR_PROXY=${LP_COLOR_PROXY:-$BOLD_BLUE} + LP_COLOR_JOB_D=${LP_COLOR_JOB_D:-$YELLOW} + LP_COLOR_JOB_R=${LP_COLOR_JOB_R:-$BOLD_YELLOW} + LP_COLOR_JOB_Z=${LP_COLOR_JOB_Z:-$BOLD_YELLOW} + LP_COLOR_ERR=${LP_COLOR_ERR:-$PURPLE} + LP_COLOR_MARK=${LP_COLOR_MARK:-$BOLD_WHITE} + LP_COLOR_MARK_ROOT=${LP_COLOR_MARK_ROOT:-$BOLD_RED} + LP_COLOR_USER_LOGGED=${LP_COLOR_USER_LOGGED:-""} + LP_COLOR_USER_ALT=${LP_COLOR_USER_ALT:-$BOLD} + LP_COLOR_USER_ROOT=${_ROOT:-$BOLD_YELLOW} + LP_COLOR_HOST=${LP_COLOR_HOST:-""} + LP_COLOR_SSH=${LP_COLOR_SSH:-$BOLD_CYAN} + LP_COLOR_TELNET=${LP_COLOR_TELNET:-$WARN_RED} + LP_COLOR_WRITE=${LP_COLOR_WRITE:-$GREEN} + LP_COLOR_NOWRITE=${LP_COLOR_NOWRITE:-$RED} + LP_COLOR_UP=${LP_COLOR_UP:-$GREEN} + LP_COLOR_COMMITS=${LP_COLOR_COMMITS:-$YELLOW} + LP_COLOR_CHANGES=${LP_COLOR_CHANGES:-$RED} + LP_COLOR_DIFF=${LP_COLOR_DIFF:-$PURPLE} + LP_COLOR_CHARGING_ABOVE=${LP_COLOR_CHARGING_ABOVE:-$GREEN} + LP_COLOR_CHARGING_UNDER=${LP_COLOR_CHARGING_UNDER:-$YELLOW} + LP_COLOR_DISCHARGING_ABOVE=${LP_COLOR_DISCHARGING_ABOVE:-$YELLOW} + LP_COLOR_DISCHARGING_UNDER=${LP_COLOR_DISCHARGING_UNDER:-$RED} + LP_COLOR_TIME=${LP_COLOR_TIME:-$BLUE} -LP_COLORMAP_0=${LP_COLORMAP_0:-""} -LP_COLORMAP_1=${LP_COLORMAP_1:-$GREEN} -LP_COLORMAP_2=${LP_COLORMAP_2:-$BOLD_GREEN} -LP_COLORMAP_3=${LP_COLORMAP_3:-$YELLOW} -LP_COLORMAP_4=${LP_COLORMAP_4:-$BOLD_YELLOW} -LP_COLORMAP_5=${LP_COLORMAP_5:-$RED} -LP_COLORMAP_6=${LP_COLORMAP_6:-$BOLD_RED} -LP_COLORMAP_7=${LP_COLORMAP_7:-$WARN_RED} -LP_COLORMAP_8=${LP_COLORMAP_8:-$CRIT_RED} -LP_COLORMAP_9=${LP_COLORMAP_9:-$DANGER_RED} + LP_COLORMAP_0=${LP_COLORMAP_0:-""} + LP_COLORMAP_1=${LP_COLORMAP_1:-$GREEN} + LP_COLORMAP_2=${LP_COLORMAP_2:-$BOLD_GREEN} + LP_COLORMAP_3=${LP_COLORMAP_3:-$YELLOW} + LP_COLORMAP_4=${LP_COLORMAP_4:-$BOLD_YELLOW} + LP_COLORMAP_5=${LP_COLORMAP_5:-$RED} + LP_COLORMAP_6=${LP_COLORMAP_6:-$BOLD_RED} + LP_COLORMAP_7=${LP_COLORMAP_7:-$WARN_RED} + LP_COLORMAP_8=${LP_COLORMAP_8:-$CRIT_RED} + LP_COLORMAP_9=${LP_COLORMAP_9:-$DANGER_RED} # Default config file may be the XDG standard ~/.config/liquidpromptrc,