Now, segments can be placed at left or at right

- Code refactor
- Print code converted into functions
- Remove unused variables
- Improved conistence in naming, variable and functions

themes/powerline-multiline/powerline-multiline.theme.bash

@@ -1,15 +1,12 @@
 #!/usr/bin/env bash
 
-THEME_PROMPT_SEPARATOR=""
+USER_INFO_SSH_CHAR=${POWERLINE_USER_INFO_SSH_CHAR:=" "}
-THEME_PROMPT_LEFT_SEPARATOR=""
-
-USER_INFO_SSH_CHAR=${USER_INFO_SSH_CHAR:=" "}
 USER_INFO_THEME_PROMPT_COLOR=32
 USER_INFO_THEME_PROMPT_COLOR_SUDO=202
 
-VIRTUALENV_CHAR=${POWERLINE_VIRTUALENV_CHAR:="❲p❳ "}
+PYTHON_VENV_CHAR=${POWERLINE_PYTHON_VENV_CHAR:="❲p❳ "}
-CONDA_VIRTUALENV_CHAR=${POWERLINE_CONDA_VIRTUALENV_CHAR:="❲c❳ "}
+CONDA_PYTHON_VENV_CHAR=${POWERLINE_CONDA_PYTHON_VENV_CHAR:="❲c❳ "}
-VIRTUALENV_THEME_PROMPT_COLOR=35
+PYTHON_VENV_THEME_PROMPT_COLOR=35
 
 SCM_NONE_CHAR=""
 SCM_GIT_CHAR=${POWERLINE_SCM_GIT_CHAR:=" "}
@@ -40,13 +37,13 @@ BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR=70
 BATTERY_STATUS_THEME_PROMPT_LOW_COLOR=208
 BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR=160
 
-THEME_PROMPT_CLOCK_FORMAT=${THEME_PROMPT_CLOCK_FORMAT:="%H:%M:%S"}
+THEME_PROMPT_CLOCK_FORMAT=${POWERLINE_PROMPT_CLOCK_FORMAT:="%H:%M:%S"}
 
-IN_VIM_PROMPT_COLOR=245
+IN_VIM_THEME_PROMPT_COLOR=245
-IN_VIM_PROMPT_TEXT="vim"
+IN_VIM_THEME_PROMPT_TEXT="vim"
 
-THEME_LEFT_SEGMENTS="scm virtualenv rvm cwd"
+POWERLINE_LEFT_PROMPT="scm python_venv rvm cwd"
-THEME_RIGHT_SEGMENTS="in_vim clock battery user_info"
+POWERLINE_RIGHT_PROMPT="in_vim clock battery user_info"
 
 
 function set_rgb_color {
@@ -60,225 +57,192 @@ function set_rgb_color {
   echo -e "\[\033[${fg}${bg}m\]"
 }
 
-function powerline_user_info_prompt {
+function __powerline_user_info_prompt {
-  local offset=2
+  local user_info=""
-  local USER_INFO=""
+  local color=${USER_INFO_THEME_PROMPT_COLOR}
-  local USER_INFO_PROMPT=""
+
-  USER_INFO_PROMPT_COLOR=${USER_INFO_THEME_PROMPT_COLOR}
   if sudo -n uptime 2>&1 | grep -q "load"; then
-    USER_INFO_PROMPT_COLOR=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
+    COLOR=${USER_INFO_THEME_PROMPT_COLOR_SUDO}
   fi
-  case "${THEME_PROMPT_USER_INFO_MODE}" in
+  case "${POWERLINE_PROMPT_USER_INFO_MODE}" in
     "sudo")
-      if [[ "${USER_INFO_PROMPT_COLOR}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
+      if [[ "${COLOR}" == "${USER_INFO_THEME_PROMPT_COLOR_SUDO}" ]]; then
-        USER_INFO="!"
+        user_info="!"
       fi
       ;;
     *)
       if [[ -n "${SSH_CLIENT}" ]]; then
-        USER_INFO="${USER_INFO_SSH_CHAR}${USER}@${HOSTNAME}"
+        user_info="${USER_INFO_SSH_CHAR}${USER}@${HOSTNAME}"
       else
-        USER_INFO="${USER}"
+        user_info="${USER}"
       fi
       ;;
   esac
-  if [[ -n "${USER_INFO}" ]]; then
+  [[ -n "${user_info}" ]] && echo "${user_info}|${COLOR}"
-    if [[ "${SEGMENT_AT_RIGHT}" -eq 0 ]]; then
-      USER_INFO_PROMPT="$(set_rgb_color ${USER_INFO_PROMPT_COLOR} -)${THEME_PROMPT_LEFT_SEPARATOR}${normal}"
-    else
-      USER_INFO_PROMPT="$(set_rgb_color ${USER_INFO_PROMPT_COLOR} ${LAST_THEME_COLOR})${THEME_PROMPT_LEFT_SEPARATOR}${normal}"
-      (( offset += 1 ))
-    fi
-    USER_INFO_PROMPT+="$(set_rgb_color - ${USER_INFO_PROMPT_COLOR}) ${USER_INFO} ${normal}"
-    RIGHT_PROMPT_LENGTH=$(( ${RIGHT_PROMPT_LENGTH} + ${#USER_INFO} + ${offset} ))
-    LAST_THEME_COLOR=${USER_INFO_PROMPT_COLOR}
-    RIGHT_PROMPT+="${USER_INFO_PROMPT}"
-    (( SEGMENT_AT_RIGHT += 1 ))
-  fi
 }
 
-function powerline_rvm_prompt {
+function __powerline_rvm_prompt {
-  local RVM_PROMPT=""
+  local RVM=""
 
   if command_exists rvm; then
-    RVM_PROMPT=$(rvm_version_prompt)
+    RVM="$(rvm_version_prompt)"
-    if [[ "${RVM_PROMPT}" != $(rvm strings default) ]]; then
+    [[ -n "${RVM}" ]] && echo "${RVM}|${RVM_THEME_PROMPT_COLOR}"
-      RVM_PROMPT="$(set_rgb_color - ${RVM_THEME_PROMPT_COLOR}) ${RVM_CHAR}${RVM_PROMPT} ${normal}"
-      if [[ "${SEGMENT_AT_LEFT}" -gt 0 ]]; then
-        RVM_PROMPT=$(set_rgb_color ${LAST_THEME_COLOR} ${RVM_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}${RVM_PROMPT}
-      fi
-      LAST_THEME_COLOR=${RVM_THEME_PROMPT_COLOR}
-      LEFT_PROMPT+="${RVM_PROMPT}"
-      (( SEGMENT_AT_LEFT += 1 ))
-    fi
   fi
 }
 
-function powerline_virtualenv_prompt {
+function __powerline_python_venv_prompt {
-  local VIRTUALENV_PROMPT=""
+  local python_venv=""
 
-  if [[ -n "$CONDA_DEFAULT_ENV" ]]; then
+  if [[ -n "${CONDA_DEFAULT_ENV}" ]]; then
-    VIRTUALENV_PROMPT="$CONDA_DEFAULT_ENV"
+    python_venv="${CONDA_DEFAULT_ENV}"
-    VIRTUALENV_CHAR=${CONDA_VIRTUALENV_CHAR}
+    PYTHONV_VENV_CHAR=${CONDA_PYTHONVENV_CHAR}
-  elif [[ -n "$VIRTUAL_ENV" ]]; then
+  elif [[ -n "${VIRTUAL_ENV}" ]]; then
-    VIRTUALENV_PROMPT=$(basename "$VIRTUAL_ENV")
+    python_venv=$(basename "${VIRTUAL_ENV}")
   fi
 
-  if [[ -n "$VIRTUALENV_PROMPT" ]]; then
+  [[ -n "${PYTHON_VENV}" ]] && echo "${python_venv}|${PYTHON_VENV_THEME_PROMPT_COLOR}"
-    VIRTUALENV_PROMPT="$(set_rgb_color - ${VIRTUALENV_THEME_PROMPT_COLOR}) ${VIRTUALENV_CHAR}${VIRTUALENV_PROMPT} ${normal}"
-    if [[ "${SEGMENT_AT_LEFT}" -gt 0 ]]; then
-      VIRTUALENV_PROMPT=$(set_rgb_color ${LAST_THEME_COLOR} ${VIRTUALENV_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}${VIRTUALENV_PROMPT}
-    fi
-    LAST_THEME_COLOR=${VIRTUALENV_THEME_PROMPT_COLOR}
-    LEFT_PROMPT+="${VIRTUALENV_PROMPT}"
-    (( SEGMENT_AT_LEFT += 1 ))
-  fi
 }
 
-function powerline_scm_prompt {
+function __powerline_scm_prompt {
+  local color=""
   local SCM_PROMPT=""
 
   scm_prompt_vars
+
   if [[ "${SCM_NONE_CHAR}" != "${SCM_CHAR}" ]]; then
     if [[ "${SCM_DIRTY}" -eq 3 ]]; then
-      SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_STAGED_COLOR}
+      COLOR=${SCM_THEME_PROMPT_STAGED_COLOR}
     elif [[ "${SCM_DIRTY}" -eq 2 ]]; then
-      SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
+      COLOR=${SCM_THEME_PROMPT_UNSTAGED_COLOR}
     elif [[ "${SCM_DIRTY}" -eq 1 ]]; then
-      SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_DIRTY_COLOR}
+      COLOR=${SCM_THEME_PROMPT_DIRTY_COLOR}
     else
-      SCM_THEME_PROMPT_COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
+      COLOR=${SCM_THEME_PROMPT_CLEAN_COLOR}
     fi
     if [[ "${SCM_GIT_CHAR}" == "${SCM_CHAR}" ]]; then
       SCM_PROMPT+="${SCM_CHAR}${SCM_BRANCH}${SCM_STATE}"
     fi
-    SCM_PROMPT="$(set_rgb_color - ${SCM_THEME_PROMPT_COLOR})${SCM_PROMPT} ${normal}"
+    echo "${SCM_PROMPT}|${COLOR}"
-    if [[ "${SEGMENT_AT_LEFT}" -gt 0 ]]; then
-      SCM_PROMPT=$(set_rgb_color ${LAST_THEME_COLOR} ${SCM_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}${SCM_PROMPT}
-    fi
-    LEFT_PROMPT+="${SCM_PROMPT}"
-    LAST_THEME_COLOR=${SCM_THEME_PROMPT_COLOR}
-    (( SEGMENT_AT_LEFT += 1 ))
   fi
 }
 
-function powerline_cwd_prompt {
+function __powerline_cwd_prompt {
-  local CWD_PROMPT=""
+  echo "$(pwd | sed "s|^${HOME}|~|")|${CWD_THEME_PROMPT_COLOR}"
-  CWD_PROMPT="$(set_rgb_color - ${CWD_THEME_PROMPT_COLOR}) \w ${normal}$(set_rgb_color ${CWD_THEME_PROMPT_COLOR} -)${normal}"
-  if [[ "${SEGMENT_AT_LEFT}" -gt 0 ]]; then
-    CWD_PROMPT=$(set_rgb_color ${LAST_THEME_COLOR} ${CWD_THEME_PROMPT_COLOR})${THEME_PROMPT_SEPARATOR}${normal}${CWD_PROMPT}
-  fi
-  LAST_THEME_COLOR=${CWD_THEME_PROMPT_COLOR}
-  LEFT_PROMPT+="${CWD_PROMPT}"
-  (( SEGMENT_AT_LEFT += 1 ))
 }
 
-function powerline_last_status_prompt {
+function __powerline_clock_prompt {
+  echo "$(date +"${THEME_PROMPT_CLOCK_FORMAT}")|${CLOCK_THEME_PROMPT_COLOR}"
+}
+
+function __powerline_battery_prompt {
+  local color=""
+  local battery_status="$(battery_percentage 2> /dev/null)"
+
+  if [[ -z "${battery_status}" ]] || [[ "${battery_status}" = "-1" ]] || [[ "${battery_status}" = "no" ]]; then
+    true
+  else
+    if [[ "$((10#${battery_status}))" -le 5 ]]; then
+      color="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
+    elif [[ "$((10#${battery_status}))" -le 25 ]]; then
+      color="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
+    else
+      color="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
+    fi
+    [[ "$(ac_adapter_connected)" ]] && battery_status="${BATTERY_AC_CHAR}${battery_status}"
+    echo "${battery_status}%|${color}"
+  fi
+}
+
+function __powerline_in_vim_prompt {
+  if [ -n "$VIMRUNTIME" ]; then
+    echo "${IN_VIM_THEME_PROMPT_TEXT}|${IN_VIM_THEME_PROMPT_COLOR}"
+  fi
+}
+
+function __powerline_last_status_prompt {
   if [[ "$1" -eq 0 ]]; then
     LAST_STATUS_PROMPT=""
   else
-    LAST_STATUS_PROMPT="$(set_rgb_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${LAST_STATUS} ${normal}"
+    LAST_STATUS_PROMPT="$(set_rgb_color ${LAST_STATUS_THEME_PROMPT_COLOR} -) ${1} ${normal}"
   fi
 }
 
-function powerline_clock_prompt {
+function __powerline_left_segment {
-  local offset=0
+  local OLD_IFS="${IFS}"; IFS="|"
-  local CLOCK=" $(date +"${THEME_PROMPT_CLOCK_FORMAT}") "
+  local params=( $1 )
+  IFS="${OLD_IFS}"
+  local separator_char=""
+  local separator=""
 
-  if [[ $? -eq 0 ]]; then
+  if [[ "${SEGMENTS_AT_LEFT}" -gt 0 ]]; then
-    local CLOCK_PROMPT=""
+    separator="$(set_rgb_color ${LAST_SEGMENT_COLOR} ${params[1]})${separator_char}${normal}${normal}"
-    RIGHT_PROMPT_LENGTH=$(( ${RIGHT_PROMPT_LENGTH} + ${#CLOCK} ))
-    if [[ "${SEGMENT_AT_RIGHT}" -eq 0 ]]; then
-      CLOCK_PROMPT=$(set_rgb_color ${CLOCK_THEME_PROMPT_COLOR} -)
-    else
-      CLOCK_PROMPT=$(set_rgb_color ${CLOCK_THEME_PROMPT_COLOR} ${LAST_THEME_COLOR})
-      (( offset += 1 ))
-    fi
-    CLOCK_PROMPT+=${THEME_PROMPT_LEFT_SEPARATOR}${normal}$(set_rgb_color - ${CLOCK_THEME_PROMPT_COLOR})${CLOCK}${normal}
-    LAST_THEME_COLOR=${CLOCK_THEME_PROMPT_COLOR}
-    RIGHT_PROMPT_LENGTH=$(( ${RIGHT_PROMPT_LENGTH} + ${offset} ))
-    RIGHT_PROMPT+="${CLOCK_PROMPT}"
-    (( SEGMENT_AT_RIGHT += 1 ))
   fi
+  LEFT_PROMPT+="${separator}$(set_rgb_color - ${params[1]}) ${params[0]} ${normal}"
+  LAST_SEGMENT_COLOR=${params[1]}
+  (( SEGMENTS_AT_LEFT += 1 ))
 }
 
-function powerline_battery_prompt {
+function __powerline_right_segment {
-  local offset=3
+  local OLD_IFS="${IFS}"; IFS="|"
-  local BATTERY_STATUS="$(battery_percentage 2> /dev/null)"
+  local params=( $1 )
-  if [[ -z "${BATTERY_STATUS}" ]] || [[ "${BATTERY_STATUS}" = "-1" ]] || [[ "${BATTERY_STATUS}" = "no" ]]; then
+  IFS="${OLD_IFS}"
-    true
+  local separator_char=""
+  local padding=2
+  local separator_color=""
+
+  if [[ "${SEGMENTS_AT_RIGHT}" -eq 0 ]]; then
+    separator_color="$(set_rgb_color ${params[1]} -)"
   else
-    local BATTERY_PROMPT=""
+    separator_color="$(set_rgb_color ${params[1]} ${LAST_SEGMENT_COLOR})"
-    if [[ "$((10#${BATTERY_STATUS}))" -le 5 ]]; then
+    (( padding += 1 ))
-      BATTERY_STATUS_THEME_PROMPT_COLOR="${BATTERY_STATUS_THEME_PROMPT_CRITICAL_COLOR}"
-    elif [[ "$((10#${BATTERY_STATUS}))" -le 25 ]]; then
-      BATTERY_STATUS_THEME_PROMPT_COLOR="${BATTERY_STATUS_THEME_PROMPT_LOW_COLOR}"
-    else
-      BATTERY_STATUS_THEME_PROMPT_COLOR="${BATTERY_STATUS_THEME_PROMPT_GOOD_COLOR}"
-    fi
-    [[ "$(ac_adapter_connected)" ]] && BATTERY_STATUS="${BATTERY_AC_CHAR}${BATTERY_STATUS}"
-    if [[ "${SEGMENT_AT_RIGHT}" -eq 0 ]]; then
-      BATTERY_PROMPT=$(set_rgb_color ${BATTERY_STATUS_THEME_PROMPT_COLOR} -)${THEME_PROMPT_LEFT_SEPARATOR}${normal}
-    else
-      BATTERY_PROMPT=$(set_rgb_color ${BATTERY_STATUS_THEME_PROMPT_COLOR} ${LAST_THEME_COLOR})${THEME_PROMPT_LEFT_SEPARATOR}${normal}
-      (( offset +=1 ))
-    fi
-    BATTERY_PROMPT+="$(set_rgb_color - ${BATTERY_STATUS_THEME_PROMPT_COLOR}) ${BATTERY_STATUS}% ${normal}"
-    RIGHT_PROMPT_LENGTH=$(( ${RIGHT_PROMPT_LENGTH} + ${#BATTERY_STATUS} + ${offset} ))
-    LAST_THEME_COLOR=${BATTERY_STATUS_THEME_PROMPT_COLOR}
-    RIGHT_PROMPT+="${BATTERY_PROMPT}"
-    (( SEGMENT_AT_RIGHT += 1 ))
   fi
+  RIGHT_PROMPT+="${separator_color}${separator_char}${normal}$(set_rgb_color - ${params[1]}) ${params[0]} ${normal}$(set_rgb_color - ${COLOR})${normal}"
+  RIGHT_PROMPT_LENGTH=$(( ${#params[0]} + RIGHT_PROMPT_LENGTH + padding ))
+  LAST_SEGMENT_COLOR="${params[1]}"
+  (( SEGMENTS_AT_RIGHT += 1 ))
 }
 
-function powerline_in_vim_prompt {
+function __powerline_prompt_command {
-  local offset=2
+  local last_status="$?" ## always the first
-  local IN_VIM_PROMPT=""
+  local separator_char=""
-  if [ -n "$VIMRUNTIME" ]; then
+  local move_cursor_rightmost='\033[500C'
-  if [[ "${SEGMENT_AT_RIGHT}" -eq 0 ]]; then
-    IN_VIM_PROMPT+="$(set_rgb_color ${IN_VIM_PROMPT_COLOR} -)${THEME_PROMPT_LEFT_SEPARATOR}${normal}"
-  else
-    IN_VIM_PROMPT+=$(set_rgb_color ${IN_VIM_PROMPT_COLOR} ${LAST_THEME_COLOR})${THEME_PROMPT_LEFT_SEPARATOR}${normal}
-    (( offset += 1 ))
-  fi
-  IN_VIM_PROMPT+="$(set_rgb_color - ${IN_VIM_PROMPT_COLOR}) ${IN_VIM_PROMPT_TEXT} ${normal}"
-  RIGHT_PROMPT_LENGTH=$(( ${RIGHT_PROMPT_LENGTH} + ${#IN_VIM_PROMPT_TEXT} + ${offset}))
-  LAST_THEME_COLOR=${IN_VIM_PROMPT_COLOR}
-  RIGHT_PROMPT+="${IN_VIM_PROMPT}"
-  (( SEGMENT_AT_RIGHT += 1 ))
-  fi
-}
-
-
-function powerline_prompt_command() {
-  local LAST_STATUS="$?"
-  local MOVE_CURSOR_RIGHTMOST='\033[500C'
 
   LEFT_PROMPT=""
   RIGHT_PROMPT=""
-  SEGMENT_AT_LEFT=0
-  SEGMENT_AT_RIGHT=0
   RIGHT_PROMPT_LENGTH=0
-  LAST_THEME_COLOR=""
+  SEGMENTS_AT_LEFT=0
+  SEGMENTS_AT_RIGHT=0
+  LAST_SEGMENT_COLOR=""
 
   ## left prompt ##
-  for segment in $THEME_LEFT_SEGMENTS; do
+  for segment in $POWERLINE_LEFT_PROMPT; do
-    "powerline_${segment}_prompt"
+    local info="$(__powerline_${segment}_prompt)"
+    [[ -n "${info}" ]] && __powerline_left_segment "${info}"
   done
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_rgb_color ${LAST_THEME_COLOR} -)${THEME_PROMPT_SEPARATOR}${normal}"
+  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_rgb_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
 
   ## right prompt ##
-  if [[ -n "${THEME_RIGHT_SEGMENTS}" ]]; then
+  if [[ -n "${POWERLINE_RIGHT_PROMPT}" ]]; then
-    LEFT_PROMPT+="${MOVE_CURSOR_RIGHTMOST}"
+    LEFT_PROMPT+="${move_cursor_rightmost}"
-    for segment in $THEME_RIGHT_SEGMENTS; do
+    for segment in $POWERLINE_RIGHT_PROMPT; do
-      "powerline_${segment}_prompt"
+      local info="$(__powerline_${segment}_prompt)"
+      [[ -n "${info}" ]] && __powerline_right_segment "${info}"
     done
     LEFT_PROMPT+="\033[${RIGHT_PROMPT_LENGTH}D"
   fi
 
-  powerline_last_status_prompt LAST_STATUS
+  __powerline_last_status_prompt "${last_status}"
 
   PS1="${LEFT_PROMPT}${RIGHT_PROMPT}\n${LAST_STATUS_PROMPT}${PROMPT_CHAR} "
+
+  ## cleanup ##
+  unset LAST_STATUS_PROMPT
+  unset LEFT_PROMPT
+  unset RIGHT_PROMPT
+  unset RIGHT_PROMPT_LENGTH
+  unset SEGMENTS_AT_LEFT
+  unset SEGMENTS_AT_RIGHT
+  unset LAST_SEGMENT_COLOR
 }
 
-PROMPT_COMMAND=powerline_prompt_command
+PROMPT_COMMAND=__powerline_prompt_command