diff --git a/CHANGELOG.md b/CHANGELOG.md index d8216a3..d4edac9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changelog ### master +- rename the plugin from `tmux-resurrect-auto` to `tmux-continuum` ### v2.2.0, 2015-02-20 - document tmux multi-server behavior in the readme diff --git a/README.md b/README.md index 079dcde..2135cac 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# tmux-resurrect-auto +# tmux-continuum Features: @@ -28,7 +28,7 @@ enable this for your system. Last saved environment is automatically restored when tmux is started. -Put `set -g @resurrect-auto-restore 'on'` in `tmux.conf` to enable this. +Put `set -g @continuum-restore 'on'` in `tmux.conf` to enable this. Note: automatic restore happens **exclusively** on tmux server start. No other action (e.g. sourcing `tmux.conf`) triggers this. @@ -46,10 +46,10 @@ of Feb 2015). Add plugin to the list of TPM plugins in `.tmux.conf`: - set -g @tpm_plugins ' \ - tmux-plugins/tpm \ - tmux-plugins/tmux-resurrect \ - tmux-plugins/tmux-resurrect-auto \ + set -g @tpm_plugins ' \ + tmux-plugins/tpm \ + tmux-plugins/tmux-resurrect \ + tmux-plugins/tmux-continuum \ ' Hit `prefix + I` to fetch the plugin and source it. The plugin will @@ -63,11 +63,11 @@ of Feb 2015). Clone the repo: - $ git clone https://github.com/tmux-plugins/tmux-resurrect-auto ~/clone/path + $ git clone https://github.com/tmux-plugins/tmux-continuum ~/clone/path Add this line to the bottom of `.tmux.conf`: - run-shell ~/clone/path/resurrect_auto.tmux + run-shell ~/clone/path/continuum.tmux Reload TMUX environment: @@ -96,7 +96,7 @@ Here are the steps to restore to a previous point in time: - `$ cd ~/.tmux/resurrect/` - locate the save file you'd like to use for restore (file names have a timestamp) - symlink the `last` file to the desired save file: `$ ln -sf last` -- do a restore with `tmux-resurrect` binding: `prefix + Ctrl-r` +- do a restore with `tmux-resurrect` key: `prefix + Ctrl-r` You should now be restored to the time when `` save happened. @@ -111,7 +111,7 @@ time to time. The interval is always measured in minutes. So setting the interval to `60` (minutes) will do the trick. Put this in `.tmux.conf`: - set -g @resurrect-auto-save-interval '60' + set -g @continuum-save-interval '60' and then source `tmux.conf` by executing this command in the shell `$ tmux source-file ~/.tmux.conf`. @@ -120,14 +120,14 @@ and then source `tmux.conf` by executing this command in the shell Just set the save interval to `0`. Put this in `.tmux.conf` - set -g @resurrect-auto-save-interval '0' + set -g @continuum-save-interval '0' and then source `tmux.conf` by executing this command in the shell `$ tmux source-file ~/.tmux.conf`. > I had automatic restore turned on, how do I disable it now? -Just remove `set -g @resurrect-auto-restore 'on'` from `tmux.conf`. +Just remove `set -g @continuum-restore 'on'` from `tmux.conf`. To be absolutely sure automatic restore doesn't happen, create a `tmux_no_auto_restore` file in your home directory (command: diff --git a/resurrect_auto.tmux b/continuum.tmux similarity index 93% rename from resurrect_auto.tmux rename to continuum.tmux index 333e038..965b93f 100755 --- a/resurrect_auto.tmux +++ b/continuum.tmux @@ -6,7 +6,7 @@ source "$CURRENT_DIR/scripts/helpers.sh" source "$CURRENT_DIR/scripts/variables.sh" source "$CURRENT_DIR/scripts/shared.sh" -save_command_interpolation="#($CURRENT_DIR/scripts/resurrect_auto_save.sh)" +save_command_interpolation="#($CURRENT_DIR/scripts/continuum_save.sh)" supported_tmux_version_ok() { $CURRENT_DIR/scripts/check_tmux_version.sh "$SUPPORTED_VERSION" @@ -49,7 +49,7 @@ just_started_tmux_server() { } start_auto_restore_in_background() { - $CURRENT_DIR/scripts/resurrect_auto_restore.sh & + $CURRENT_DIR/scripts/continuum_restore.sh & } main() { diff --git a/scripts/resurrect_auto_restore.sh b/scripts/continuum_restore.sh similarity index 100% rename from scripts/resurrect_auto_restore.sh rename to scripts/continuum_restore.sh diff --git a/scripts/resurrect_auto_save.sh b/scripts/continuum_save.sh similarity index 100% rename from scripts/resurrect_auto_save.sh rename to scripts/continuum_save.sh diff --git a/scripts/handle_tmux_automatic_start/README.md b/scripts/handle_tmux_automatic_start/README.md index 0e21c06..efff29c 100644 --- a/scripts/handle_tmux_automatic_start/README.md +++ b/scripts/handle_tmux_automatic_start/README.md @@ -5,7 +5,7 @@ Tmux is automatically started after the computer/server is turned on. ### OS X To enable this feature: -- put `set -g @resurrect-auto-tmux-start 'on'` in `tmux.conf` +- put `set -g @continuum-boot 'on'` in `tmux.conf` - reload tmux config with this shell command: `$ tmux source-file ~/.tmux.conf` Next time the computer is started: @@ -14,11 +14,11 @@ Next time the computer is started: - if "auto restore" feature is enabled, tmux will start restoring previous env Config options: -- `set -g @resurrect-auto-tmux-start-options 'fullscreen'` - terminal window +- `set -g @continuum-boot-options 'fullscreen'` - terminal window will go fullscreen -- `set -g @resurrect-auto-tmux-start-options 'iterm'` - start `iTerm` instead +- `set -g @continuum-boot-options 'iterm'` - start `iTerm` instead of `Terminal.app` -- `set -g @resurrect-auto-tmux-start-options 'iterm,fullscreen'` - start `iTerm` +- `set -g @continuum-boot-options 'iterm,fullscreen'` - start `iTerm` in fullscreen ### Linux diff --git a/scripts/variables.sh b/scripts/variables.sh index 600abec..1ddda9e 100644 --- a/scripts/variables.sh +++ b/scripts/variables.sh @@ -4,23 +4,23 @@ SUPPORTED_VERSION="1.9" resurrect_save_path_option="@resurrect-save-script-path" resurrect_restore_path_option="@resurrect-restore-script-path" +auto_save_interval_option="@continuum-save-interval" auto_save_interval_default="15" -auto_save_interval_option="@resurrect-auto-save-interval" # time when the tmux environment was last saved (unix timestamp) -last_auto_save_option="@resurrect-auto-save-last-timestamp" +last_auto_save_option="@continuum-save-last-timestamp" -auto_restore_option="@resurrect-auto-restore" +auto_restore_option="@continuum-restore" auto_restore_default="off" auto_restore_halt_file="${HOME}/tmux_no_auto_restore" # tmux auto start options -auto_start_option="@resurrect-auto-tmux-start" +auto_start_option="@continuum-boot" auto_start_default="off" # comma separated list of additional options for tmux auto start -auto_start_config_option="@resurrect-auto-tmux-start-options" +auto_start_config_option="@continuum-boot-options" auto_start_config_default="" osx_auto_start_file_name="Tmux.Start.plist"