fixup! added support for configuration files in the following locations: - ~/.tmux.conf and ~/.tmux.conf.local - $XDG_CONFIG_HOME/tmux/tmux.conf and $XDG_CONFIG_HOME/tmux/tmux.conf.local - ~/.config/tmux/tmux.conf and ~/.config/tmux/tmux.conf.local
This commit is contained in:
parent
fd3dde9bcd
commit
a0cc261f45
1 changed files with 3 additions and 3 deletions
|
@ -143,7 +143,7 @@ bind P choose-buffer # choose which buffer to paste from
|
|||
# -- 8< ------------------------------------------------------------------------
|
||||
|
||||
%if #{==:#{TMUX_EXECUTABLE},}
|
||||
run 'tmux set-environment -g TMUX_EXECUTABLE $(lsof -b -w -a -d txt -p #{pid} -Fn 2>/dev/null | perl -n -e "do { print; last } if $R += s/^n((?:.(?!dylib$|so$))+)$/\1/g; END { exit 1 unless $R > 0 }" || readlink "/proc/#{pid}/exe" || printf tmux)'
|
||||
run 'tmux set-environment -g TMUX_EXECUTABLE $(lsof -b -w -a -d txt -p #{pid} -Fn 2>/dev/null | perl -n -e "if (s/^n((?:.(?!dylib$|so$))+)$/\1/g) { print; exit } } exit 1; {" || readlink "/proc/#{pid}/exe" || printf tmux)'
|
||||
%endif
|
||||
%if #{==:#{TMUX_CONF},}
|
||||
run 'tmux set-environment -g TMUX_CONF $(for conf in "$HOME/.tmux.conf" "$XDG_CONFIG_HOME/tmux/tmux.conf" "$HOME/.config/tmux/tmux.conf"; do [ -f "$conf" ] && printf "%s" "$conf" && break; done)'
|
||||
|
@ -178,7 +178,7 @@ run 'cut -c3- "#{TMUX_CONF}" | sh -s _apply_configuration'
|
|||
#
|
||||
# if [ -z "$TMUX_EXECUTABLE" ]; then
|
||||
# TMUX_PID=$(printf '%s' "$TMUX" | cut -d, -f2)
|
||||
# TMUX_EXECUTABLE=$(lsof -b -w -a -d txt -p "$TMUX_PID" -Fn 2>/dev/null | perl -n -e "do { print; last } if $R += s/^n((?:.(?!dylib$|so$))+)$/\1/g; END { exit 1 unless $R > 0}" || printf tmux)
|
||||
# TMUX_EXECUTABLE=$(lsof -b -w -a -d txt -p "$TMUX_PID" -Fn 2>/dev/null | perl -n -e "if (s/^n((?:.(?!dylib$|so$))+)$/\1/g) { print; exit } } exit 1; {" || printf tmux)
|
||||
# fi
|
||||
# if [ x"$TMUX_EXECUTABLE" = x"tmux" ]; then
|
||||
# TMUX_EXECUTABLE="command tmux"
|
||||
|
@ -1367,7 +1367,7 @@ run 'cut -c3- "#{TMUX_CONF}" | sh -s _apply_configuration'
|
|||
# # -- custom variables ------------------------------------------------------
|
||||
#
|
||||
# if [ -f "$TMUX_CONF_LOCAL" ] && [ x"$(cut -c3- "$TMUX_CONF_LOCAL" | sh 2>/dev/null -s printf probe)" = x"probe" ]; then
|
||||
# replacements=$(perl -n -e "print if s!^#\s+([^_][^()\s]+)\s*\(\)\s*{\s*(?:#.*)?\n!s%#\\\{\1((?:\\s+(?:[^\{\}]+?|#\\{(?:[^\{\}]+?)\}))*)\\\}%#(cut -c3- \"$TMUX_CONF_LOCAL\" | sh -s \1\\1)%g; !p" < "$TMUX_CONF_LOCAL")
|
||||
# replacements=$(perl -n -e 'print if s!^#\s+([^_][^()\s]+)\s*\(\)\s*{\s*(?:#.*)?\n!s%#\\\{\1((?:\\s+(?:[^\{\}]+?|#\\{(?:[^\{\}]+?)\}))*)\\\}%#(cut -c3- \"$TMUX_CONF_LOCAL\" | sh -s \1\\1)%g; !p' "$TMUX_CONF_LOCAL")
|
||||
# status_left=$(echo "$status_left" | perl -p -e "$replacements" || echo "$status_left")
|
||||
# status_right=$(echo "$status_right" | perl -p -e "$replacements" || echo "$status_right")
|
||||
# fi
|
||||
|
|
Loading…
Reference in a new issue