prj

shell/bashrc

@@ -34,35 +34,17 @@ if [ -n "$HISTFILE" ] && ! [ -d "${HISTFILE%/*}" ] ; then
     mkdir -p "${HISTFILE%/*}" && touch "$HISTFILE"
 fi
 
-format_workdir() {
-    CODE="$?"
-    ROOT_DIR="$(git rev-parse --show-toplevel 2>/dev/null)"
-    [ -n "$ROOT_DIR" ] &&
-        ROOT_DIR="${ROOT_DIR##*/}" &&
-        printf '\033[34m%s\033[0m ' "$ROOT_DIR"
-    return "$CODE"
-}
-
-format_git_branch() {
-    CODE="$?"
+_prompt_git_branch() {
     GIT_BRANCH="$(git branch 2>/dev/null | sed '/\*/!d;s/^\*\s*//g;s/\s*$//g')"
-    [ -n "$GIT_BRANCH" ] && printf "\033[1m\033[35m%s\033[0m " "$GIT_BRANCH"
-    return "$CODE"
+    [ -n "$GIT_BRANCH" ] && printf '%s ' "$GIT_BRANCH"
 }
 
-format_prompt() {
-    CODE="${1}"
-    if [ "${CODE}" != 0 ] ; then
-        printf '\033[31m\033[1m>\033[0m '
-    else
-        printf '\033[32m>\033[0m '
-    fi
-}
-
-PS1='\[\033[2m\]\A\[\033[0m\] \
-$(format_workdir ${?})\
-$(format_git_branch ${?})\
-$(format_prompt ${?})\
+PROMPT_COMMAND='if [ "$?" = 0 ]; then EXIT_COLOR="\033[32m"; else EXIT_COLOR="\033[31m"; fi'
+PS1='\
+\[\033[2m\]\A\[\033[0m\] \
+\[\033[34m\]\w\[\033[0m\] \
+\[\033[35m\]\[\033[1m\]$(_prompt_git_branch)\[\033[0m\]\
+\[$(echo -ne $EXIT_COLOR)\]>\[\033[0m\] \
 '
 
 ! command -v sudo >/dev/null 2>&1 &&
@@ -74,7 +56,7 @@ alias \
     cfg="cd $HOME/.config/ && ls" \
     tmp="cd $HOME/Desktop/temp/ && ls" \
     dsk="cd $HOME/Desktop/ && ls" \
-    prj="cd $HOME/Desktop/projects && ls" \
+    prj="cd $HOME/Projects && ls" \
     doc="cd $HOME/Documents/ && ls" \
     dow="cd $HOME/Downloads/ && ls" \
     mus="cd $HOME/Music/ && ls" \