fix tmux issues
This commit is contained in:
parent
52877e5f9a
commit
f1c113c89a
1 changed files with 19 additions and 9 deletions
14
functions.sh
14
functions.sh
|
@ -57,11 +57,21 @@ function _pkcs11module_hook() {
|
|||
fi
|
||||
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
|
||||
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
|
||||
||||||| parent of a74d663 (fix tmux issues)
|
||||
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
|
||||
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
|
||||
=======
|
||||
|
||||
>>>>>>> a74d663 (fix tmux issues)
|
||||
function _tmux_hook() {
|
||||
# [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)"
|
||||
|
||||
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions,
|
||||
# every time prompt is called. It does it only, when called from tmux (Environment TMUX is set)
|
||||
# [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)"
|
||||
|
||||
if [ -n "${TMUX}" ]; then
|
||||
eval "$(tmux show-environment -s)"
|
||||
|
@ -69,8 +79,8 @@ function _tmux_hook() {
|
|||
|
||||
}
|
||||
|
||||
# To make the code more reliable on detecting the default umask
|
||||
function _umask_hook {
|
||||
# To make the code more reliable on detecting the default umask
|
||||
# Record the default umask value on the 1st run
|
||||
[[ -z $DEFAULT_UMASK ]] && export DEFAULT_UMASK="$(builtin umask)"
|
||||
|
||||
|
|
Loading…
Reference in a new issue