jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix tmux issues

Browse source
This commit is contained in:
Jakobus Schürz 2023-03-07 12:07:41 +01:00
parent 424a923257
commit 5e10667910
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
functions.sh
View file

@ -57,10 +57,20 @@ function _pkcs11module_hook() {
fi fi
} }
<<<<<<< HEAD
## this function updates in combination with PROMPT_COMMAND the shell-environment-variables in tmux-sessions, ## 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) # 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() { function _tmux_hook() {
## 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)" # [ -z "${TMUX+x}" ] || eval "$(tmux show-environment -s)"
if [ -n "${TMUX}" ]; then if [ -n "${TMUX}" ]; then
@ -69,8 +79,8 @@ function _tmux_hook() {
} }
# To make the code more reliable on detecting the default umask
function _umask_hook { function _umask_hook {
# To make the code more reliable on detecting the default umask
# Record the default umask value on the 1st run # Record the default umask value on the 1st run
[[ -z $DEFAULT_UMASK ]] && export DEFAULT_UMASK="$(builtin umask)" [[ -z $DEFAULT_UMASK ]] && export DEFAULT_UMASK="$(builtin umask)"