From 1260fc96ada0e0d5ad9ae6a258baef6dad172186 Mon Sep 17 00:00:00 2001 From: John Mertz Date: Thu, 29 Dec 2022 17:50:45 -0500 Subject: [PATCH] Tabs -> Spaces Testing new NeoVim configs --- bash/prompt.sh | 166 ++++++++++++++++++++++++------------------------- 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/bash/prompt.sh b/bash/prompt.sh index bc4c1752e..95c4a3c18 100755 --- a/bash/prompt.sh +++ b/bash/prompt.sh @@ -3,10 +3,10 @@ # Explain prompt ARG=$1 if [[ $ARG == 'h' || $ARG == '-h' || $ARG == 'help' || $ARG == '--help' || $ARG == '?' ]]; then - ARG="-h" + ARG="-h" elif [[ $ARG != '' ]]; then - echo "Invalid argument: $ARG" - exit 0 + echo "Invalid argument: $ARG" + exit 0 fi # If directory was just changed to the root of a git repository, print onefetch @@ -33,69 +33,69 @@ GC="5" # git # Declare the SET name (as used by `setterm`) and PS string for colour options # Reference them later like: ${COLOURS["5","SET"]} or ${COLOURS["2","PS"]} declare -A COLOURS='( - [0,SET]="default" - [0,PS]="\[\033[0;0m\]" - [1,SET]="red" - [1,PS]="\[\033[0;31m\]" - [2,SET]="green" - [2,PS]="\[\033[0;32m\]" - [3,SET]="yellow" - [3,PS]="\[\033[0;33m\]" - [4,SET]="blue" - [4,PS]="\[\033[0;34m\]" - [5,SET]="magenta" - [5,PS]="\[\033[0;35m\]" - [6,SET]="cyan" - [6,PS]="\[\033[0;36m\]" - [7,SET]="white" - [7,PS]="\[\033[0;37m\]" + [0,SET]="default" + [0,PS]="\[\033[0;0m\]" + [1,SET]="red" + [1,PS]="\[\033[0;31m\]" + [2,SET]="green" + [2,PS]="\[\033[0;32m\]" + [3,SET]="yellow" + [3,PS]="\[\033[0;33m\]" + [4,SET]="blue" + [4,PS]="\[\033[0;34m\]" + [5,SET]="magenta" + [5,PS]="\[\033[0;35m\]" + [6,SET]="cyan" + [6,PS]="\[\033[0;36m\]" + [7,SET]="white" + [7,PS]="\[\033[0;37m\]" )' # Get current git branch function parse_git_branch() { - BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` - if [ ! "${BRANCH}" == "" ] - then - STAT=`parse_git_dirty` - echo "${COLOURS[\"$GC\",\"PS\"]}(${BRANCH}${STAT})${COLOURS[\"0\",\"PS\"]}" - else - echo "" - fi + BRANCH=`git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'` + if [ ! "${BRANCH}" == "" ] + then + STAT=`parse_git_dirty` + echo "${COLOURS[\"$GC\",\"PS\"]}(${BRANCH}${STAT})${COLOURS[\"0\",\"PS\"]}" + else + echo "" + fi } # Get git status function parse_git_dirty { - status=`git status 2>&1 | tee` - dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"` - untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"` - ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"` - newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"` - renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"` - deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"` - bits='' - if [ "${renamed}" == "0" ]; then - bits=">${bits}" - fi - if [ "${ahead}" == "0" ]; then - bits="*${bits}" - fi - if [ "${newfile}" == "0" ]; then - bits="+${bits}" - fi - if [ "${untracked}" == "0" ]; then - bits="?${bits}" - fi - if [ "${deleted}" == "0" ]; then - bits="x${bits}" - fi - if [ "${dirty}" == "0" ]; then - bits="!${bits}" - fi - if [ "${bits}" != "" ]; then - echo " ${bits}" - else - echo "" - fi + status=`git status 2>&1 | tee` + dirty=`echo -n "${status}" 2> /dev/null | grep "modified:" &> /dev/null; echo "$?"` + untracked=`echo -n "${status}" 2> /dev/null | grep "Untracked files" &> /dev/null; echo "$?"` + ahead=`echo -n "${status}" 2> /dev/null | grep "Your branch is ahead of" &> /dev/null; echo "$?"` + newfile=`echo -n "${status}" 2> /dev/null | grep "new file:" &> /dev/null; echo "$?"` + renamed=`echo -n "${status}" 2> /dev/null | grep "renamed:" &> /dev/null; echo "$?"` + deleted=`echo -n "${status}" 2> /dev/null | grep "deleted:" &> /dev/null; echo "$?"` + bits='' + if [ "${renamed}" == "0" ]; then + bits=">${bits}" + fi + if [ "${ahead}" == "0" ]; then + bits="*${bits}" + fi + if [ "${newfile}" == "0" ]; then + bits="+${bits}" + fi + if [ "${untracked}" == "0" ]; then + bits="?${bits}" + fi + if [ "${deleted}" == "0" ]; then + bits="x${bits}" + fi + if [ "${dirty}" == "0" ]; then + bits="!${bits}" + fi + if [ "${bits}" != "" ]; then + echo " ${bits}" + else + echo "" + fi } # Comment - allow for command history to be copied directly to bash script @@ -112,34 +112,34 @@ fi # Time PS1="${PS1}${COLOURS["$TC","PS"]}\\t " if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$TC","SET"]}; echo "time"; setterm --foreground default + setterm --foreground ${COLOURS["$TC","SET"]}; echo "time"; setterm --foreground default fi # Python venv if [ $VIRTUAL_ENV ]; then - VENV="${VIRTUAL_ENV##*/}" - VENV=`echo $VENV | sed -r 's/.*/[\0]/'` - PS1="${PS1}${COLOURS["$EC","PS"]}${VENV} " - if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$EC","SET"]}; echo "venv"; setterm --foreground default - fi + VENV="${VIRTUAL_ENV##*/}" + VENV=`echo $VENV | sed -r 's/.*/[\0]/'` + PS1="${PS1}${COLOURS["$EC","PS"]}${VENV} " + if [[ $ARG == '-h' ]]; then + setterm --foreground ${COLOURS["$EC","SET"]}; echo "venv"; setterm --foreground default + fi fi # Debian Chroot if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then - PS1="${PS1}${COLOURS["$CC","PS"]}<$(cat /etc/debian_chroot)>" - if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$CC","SET"]}; echo "debian chroot"; setterm --foreground default - fi + PS1="${PS1}${COLOURS["$CC","PS"]}<$(cat /etc/debian_chroot)>" + if [[ $ARG == '-h' ]]; then + setterm --foreground ${COLOURS["$CC","SET"]}; echo "debian chroot"; setterm --foreground default + fi fi # User if [[ `whoami` == 'root' ]]; then - UC=$RC + UC=$RC fi PS1="${PS1}${COLOURS["$UC","PS"]}\\u" if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$UC","SET"]}; echo "user"; setterm --foreground default + setterm --foreground ${COLOURS["$UC","SET"]}; echo "user"; setterm --foreground default fi # @ @@ -147,14 +147,14 @@ PS1="${PS1}${COLOURS["$PC","PS"]}@" # Host if [[ $SSH_TTY != '' ]]; then - HC="${SC}" # Host colour - if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$HC","SET"]}; echo "host"; setterm --foreground default - fi + HC="${SC}" # Host colour + if [[ $ARG == '-h' ]]; then + setterm --foreground ${COLOURS["$HC","SET"]}; echo "host"; setterm --foreground default + fi else - if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$HC","SET"]}; echo "host (ssh)"; setterm --foreground default - fi + if [[ $ARG == '-h' ]]; then + setterm --foreground ${COLOURS["$HC","SET"]}; echo "host (ssh)"; setterm --foreground default + fi fi PS1="${PS1}${COLOURS["$HC","PS"]}\\h" @@ -164,16 +164,16 @@ PS1="${PS1}${COLOURS["$PC","PS"]}:" # Dir PS1="${PS1}${COLOURS["$DC","PS"]}\\w " if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$DC","SET"]}; echo "directory"; setterm --foreground default + setterm --foreground ${COLOURS["$DC","SET"]}; echo "directory"; setterm --foreground default fi # Git GIT=$(parse_git_branch) if [[ $GIT != '' ]]; then - PS1="${PS1}${COLOURS["$GC","PS"]}${GIT}" - if [[ $ARG == '-h' ]]; then - setterm --foreground ${COLOURS["$GC","SET"]}; echo "git branch status"; setterm --foreground default - fi + PS1="${PS1}${COLOURS["$GC","PS"]}${GIT}" + if [[ $ARG == '-h' ]]; then + setterm --foreground ${COLOURS["$GC","SET"]}; echo "git branch status"; setterm --foreground default + fi fi # \n - start input on new line, again to support copy-paste into bash script