v2.2.0

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ### master
 
+### v2.2.0, 2015-02-12
+- bugfix: zoomed windows related regression
+- export save and restore script paths so that 'tmux-resurrect-save' plugin can
+  use them
+- enable "quiet" saving (used by 'tmux-resurrect-save' plugin)
+
 ### v2.1.0, 2015-02-12
 - if restore is started when there's only **1 pane in the whole tmux server**,
   assume the users wants the "full restore" and overrwrite that pane.

resurrect.tmux

@@ -25,9 +25,15 @@ set_default_strategies() {
 	tmux set-option -g "${restore_process_strategy_option}irb" "default_strategy"
 }
 
+set_script_path_options() {
+	tmux set-option -g "$save_path_option" "$CURRENT_DIR/scripts/save.sh"
+	tmux set-option -g "$restore_path_option" "$CURRENT_DIR/scripts/restore.sh"
+}
+
 main() {
 	set_save_bindings
 	set_restore_bindings
 	set_default_strategies
+	set_script_path_options
 }
 main

scripts/helpers.sh

@@ -66,6 +66,13 @@ is_session_grouped() {
 	[[ "$GROUPED_SESSIONS" == *"${d}${session_name}${d}"* ]]
 }
 
+restore_zoomed_windows() {
+	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $6 ~ /Z/ && $9 == 1 { print $2, $3; }' $(last_resurrect_file) |
+		while IFS=$d read session_name window_number; do
+			tmux resize-pane -t "${session_name}:${window_number}" -Z
+		done
+}
+
 # path helpers
 
 resurrect_dir() {

scripts/restore.sh

@@ -245,13 +245,6 @@ restore_active_pane_for_each_window() {
 		done
 }
 
-restore_zoomed_windows() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $6 ~ /Z/ && $9 == 1 { print $2, $3; }' $(last_resurrect_file) |
-		while IFS=$d read session_name window_number; do
-			tmux resize-pane -t "${session_name}:${window_number}" -Z
-		done
-}
-
 restore_grouped_sessions() {
 	while read line; do
 		if is_line_type "grouped_session" "$line"; then

scripts/save.sh

@@ -10,6 +10,9 @@ source "$CURRENT_DIR/spinner_helpers.sh"
 d=$'\t'
 delimiter=$'\t'
 
+# if "quiet" script produces no output
+SCRIPT_OUTPUT="$1"
+
 grouped_sessions_format() {
 	local format
 	format+="#{session_grouped}"
@@ -210,12 +213,20 @@ save_all() {
 	restore_zoomed_windows
 }
 
+show_output() {
+	[ "$SCRIPT_OUTPUT" != "quiet" ]
+}
+
 main() {
 	if supported_tmux_version_ok; then
+		if show_output; then
 			start_spinner "Saving..." "Tmux environment saved!"
+		fi
 		save_all
+		if show_output; then
 			stop_spinner
 			display_message "Tmux environment saved!"
 		fi
+	fi
 }
 main

scripts/variables.sh

@@ -1,9 +1,11 @@
 # key bindings
 default_save_key="C-s"
 save_option="@resurrect-save"
+save_path_option="@resurrect-save-script-path"
 
 default_restore_key="C-r"
 restore_option="@resurrect-restore"
+restore_path_option="@resurrect-restore-script-path"
 
 # default processes that are restored
 default_proc_list_option="@resurrect-default-processes"