Browse Source

Update SHLVL

master
10sr 1 year ago
parent
commit
7d4f61d385
2 changed files with 5 additions and 5 deletions
  1. +4
    -4
      shrc
  2. +1
    -1
      tmux.conf

+ 4
- 4
shrc View File

@@ -1046,11 +1046,11 @@ __my_ps1_jobs(){
} }


__my_ps1_dollar(){ __my_ps1_dollar(){
if test -z "$SHLVL"
if test -z "$2"
then then
printf "$1" printf "$1"
else else
perl -e 'while($ARGV[0]-- > 0){print "$ARGV[1]";}' $SHLVL "$1"
perl -e 'while($ARGV[0]-- > 0){print "$ARGV[1]";}' "$2" "$1"
fi fi
} }


@@ -1172,13 +1172,13 @@ if $inzsh
then then
PROMPT="\ PROMPT="\
${__my_ps1_beg}[${__my_c2}%n@%M${__my_cdef}:${__my_c1}%~/${__my_cdef}]\$(__my_ps1_info1) ${__my_ps1_beg}[${__my_c2}%n@%M${__my_cdef}:${__my_c1}%~/${__my_cdef}]\$(__my_ps1_info1)
${__my_ps1_beg}\$(__my_ps1_info2) $(__my_ps1_dollar %#) "
${__my_ps1_beg}\$(__my_ps1_info2) $(__my_ps1_dollar %# $SHLVL) "
RPROMPT="%D{%Y/%m/%d %H:%M}" RPROMPT="%D{%Y/%m/%d %H:%M}"
elif $inbash elif $inbash
then then
PS1="\ PS1="\
${__my_ps1_beg}[${__my_c2}\u@\H${__my_cdef}:${__my_c1}\w/${__my_cdef}]\$(__my_ps1_info1)\n\ ${__my_ps1_beg}[${__my_c2}\u@\H${__my_cdef}:${__my_c1}\w/${__my_cdef}]\$(__my_ps1_info1)\n\
${__my_ps1_beg}\D{%Y/%m/%d %H:%M} \$(__my_ps1_info2)${__my_ps1_right} $(__my_ps1_dollar \\$) "
${__my_ps1_beg}\D{%Y/%m/%d %H:%M} \$(__my_ps1_info2)${__my_ps1_right} $(__my_ps1_dollar \\$ $SHLVL) "
else else
true true
# PS1="$(printf $(whoami)@$(hostname)$ )" # PS1="$(printf $(whoami)@$(hostname)$ )"


+ 1
- 1
tmux.conf View File

@@ -29,7 +29,7 @@ setw -g mode-keys vi
#setw -g mode-mouse off #setw -g mode-mouse off
#set -g default-command /bin/bash #set -g default-command /bin/bash
# Use C-z x to kill window # Use C-z x to kill window
set -g default-command "while true; do /bin/bash -l; done"
set -g default-command "while true; do env SHLVL= /bin/bash -l; done"


# Use pasteboard on MacOS # Use pasteboard on MacOS
run-shell 'test "`uname`" = Darwin && tmux bind-key -T copy-mode-vi "Enter" send-keys -X copy-pipe-and-cancel "pbcopy"' run-shell 'test "`uname`" = Darwin && tmux bind-key -T copy-mode-vi "Enter" send-keys -X copy-pipe-and-cancel "pbcopy"'


Loading…
Cancel
Save