tmux-plugins
/
tmux-resurrect
mirror of https://github.com/tmux-plugins/tmux-resurrect
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed a case where user executes resurrect save while focus is in a tmux session which is part of a session group, and focussed session does not have @resurrect-dir set. Tmux session groups do not share/inherit session options amoung member sessions. The fix is to identify if the focussed session is part of a session group, if yes then iterate over the group to find the first session that has @resurrect-dir, and use that @resurrect-dir value. If the session is not part of a group, then simply try finding if it has a @resurrect-dir set and use that if thats the case. In either case, if @resurrect-dir is not found then default to the default_resurrect_dir value used by tmux-resurrect.

pull/390/head
Robin Stern 2021-07-08 16:53:19 -07:00
parent 068272bbcb
commit 21de0b35cd
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/helpers.sh
View File

@ -13,8 +13,8 @@ d=$'\t'
get_tmux_option() {
local option="$1"
local default_value="$2"
local showoptionswitch="${3:--gqv}"
local option_value=$(tmux show-option $showoptionswitch "$option")
local showoptionswitch="${3:--gqv}"
local option_value=$(eval "tmux show-options $showoptionswitch $option")
if [ -z "$option_value" ]; then
echo "$default_value"
else
@ -102,7 +102,22 @@ pane_content_files_restore_from_archive() {
resurrect_dir() {
if [ -z "$_RESURRECT_DIR" ]; then
local path="$(get_tmux_option "$resurrect_dir_option" "$default_resurrect_dir" "-qv")"
# @resurrect-dir is no longer a global option, and it is local to session. A user can add multiple sessions to the same group
# after opening a resurrect session. Grouped sessions do not share session options. So a user can execute resurrect save
# while focus is no a session that does not have @resurrect-dir option set. The following code makes sure to find the value of
# group's @resurrect-dir by iterating over sessions within a group if the session is grouped, or simply return @resurrect-dir for current session if ungrouped.
local IFS=$'\n'
local sessionnamearray=$(eval 'tmux list-sessions -f "#{?session_grouped,#{session_group_attached},#{session_attached}}" -F "#{session_name}"')
for i in ${sessionnamearray[@]}; do
local temppath="$(get_tmux_option "$resurrect_dir_option" "" "-qv -t $i")"
if [ ! -z $temppath ]; then
local path=$temppath
break
fi
done
if [ -z $path ]; then
local path=$default_resurrect_dir
fi
# expands tilde, $HOME and $HOSTNAME if used in @resurrect-dir
echo "$path" | sed "s,\$HOME,$HOME,g; s,\$HOSTNAME,$(hostname),g; s,\~,$HOME,g"
else