From 49ab26a5849806236b0ebabdab672767acbaf67c Mon Sep 17 00:00:00 2001 From: Maxim Likhachev Date: Tue, 18 Feb 2020 15:40:08 +0300 Subject: [PATCH] =?UTF-8?q?bash:=20=D0=9E=D0=B4=D0=B8=D0=BD=D0=B0=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=D0=BE=D0=B5=20=D0=BF=D1=80=D0=B8=D0=B3=D0=BB=D0=B0?= =?UTF-8?q?=D1=88=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD?= =?UTF-8?q?=D0=B4=D0=BD=D0=BE=D0=B9=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BD=D0=B0=20=D0=B2=D1=81=D0=B5=D1=85=20=D1=81=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BC=D0=B0=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- etc/shell/bash/bashrc | 13 ++++++++++++- etc/shell/bash/bashrc_linux | 11 ----------- etc/shell/bash/bashrc_macos | 2 -- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc index 9ee4a64..c05cd1a 100755 --- a/etc/shell/bash/bashrc +++ b/etc/shell/bash/bashrc @@ -1,6 +1,6 @@ #!/bin/bash #################################################################### # -# Изменён: чт 19 дек 2019 20:41:05 +# Изменён: вт 18 фев 2020 15:37:12 # ################################################################################ @@ -180,6 +180,17 @@ else #export HOME=$HOME fi +PS1_JOBS="${PROMPT_COLOR}┌─(${yellow}\j${PROMPT_COLOR})" +PS1_HOST="─[${yellow}\h${PROMPT_COLOR}]${PROMPT_SHH}" +PS1_CWD="─[${red}${VIFM_SHELL}${yellow}\w${PROMPT_COLOR}]\n" + +PS1_LINE1="${PS1_JOBS}${PS1_HOST}${PS1_CWD}" +PS1_LINE2="${PROMPT_COLOR}─[${PROMPT_COLOR}\t]\$ $rstc" + +PS1="${PS1_LINE1}${PS1_LINE2}" + +unset PS1_JOBS PS1_HOST PS1_CWD PS1_LINE1 PS1_LINE2 + # }}} ########################################################################## # {{{ Подключение псевдонимов ################################################################################ diff --git a/etc/shell/bash/bashrc_linux b/etc/shell/bash/bashrc_linux index 3b660e5..49ad9c7 100644 --- a/etc/shell/bash/bashrc_linux +++ b/etc/shell/bash/bashrc_linux @@ -16,14 +16,3 @@ path++ /bin:/usr/bin:/usr/local/bin PATH # export LS_COLORS=$($BASHRC/ls_colors_generator.py) export LS_COLORS=$(cat $BASHRC/ls_colors_generated) -PS1_JOBS="${PROMPT_COLOR}┌─(${yellow}\j${PROMPT_COLOR})" -PS1_HOST="─[${yellow}\h${PROMPT_COLOR}]${PROMPT_SHH}" -PS1_CWD="─[${red}${VIFM_SHELL}${yellow}\w${PROMPT_COLOR}]\n" - -PS1_LINE1="${PS1_JOBS}${PS1_HOST}${PS1_CWD}" -PS1_LINE2="${PROMPT_COLOR}─[${PROMPT_COLOR}\t]\$ $rstc" - -PS1="${PS1_LINE1}${PS1_LINE2}" - -unset PS1_JOBS PS1_HOST PS1_CWD PS1_LINE1 PS1_LINE2 - diff --git a/etc/shell/bash/bashrc_macos b/etc/shell/bash/bashrc_macos index 18aaa0a..b7e5a89 100644 --- a/etc/shell/bash/bashrc_macos +++ b/etc/shell/bash/bashrc_macos @@ -23,5 +23,3 @@ pi=40;33:so=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:\ *.c=00;04:*.cpp=00;04:*.pas=00;04:*.ui=00;04:*.sh=00;04:*.py=00;04:*.rb=00;04:\ *.gl=01;35:*.dl=01;35:" -PS1="$PROMPT_COLOR[${yellow}devopc${PROMPT_COLOR}]-(${yellow}\j${PROMPT_COLOR})$PROMPT_SHH-[$yellow\w$PROMPT_COLOR]\n$PROMPT_COLOR[$PROMPT_COLOR\t]\$ $rstc" -