From b6fb16f31802cb6a0a8e57cd67daa6387a1ccff1 Mon Sep 17 00:00:00 2001 From: Rehan Guha Date: Mon, 20 Jun 2022 16:44:53 +0530 Subject: [PATCH 1/5] Updated README and removed `$` symbol This will help to directly copy and paste in the terminal and not to perform an extra step and remove the $ symbol --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe90855..2371863 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Requirements: `tmux` version 1.9 (or higher), `git`, `bash`. Clone TPM: ```bash -$ git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm +git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm ``` Put this at the bottom of `~/.tmux.conf` (`$XDG_CONFIG_HOME/tmux/tmux.conf` @@ -40,7 +40,7 @@ Reload TMUX environment so TPM is sourced: ```bash # type this in terminal if tmux is already running -$ tmux source ~/.tmux.conf +tmux source ~/.tmux.conf ``` That's it! @@ -93,7 +93,7 @@ Run tests with: ```bash # within project directory -$ ./run_tests +./run_tests ``` ### License From fc412cbdf765175ea9f3380db6b9e1b1603a68a7 Mon Sep 17 00:00:00 2001 From: Bruno Sutic Date: Tue, 3 Jan 2023 21:06:46 +0100 Subject: [PATCH 2/5] v3.1.0 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 394758d..a9ce81e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog ### master + +### v3.1.0, 2023-01-03 - upgrade to new version of `tmux-test` - bug: when using `emacs` copy mode, Enter does not quit screen after tpm installation/update. Fix by making `Escape` the key for emacs mode. @@ -9,6 +11,7 @@ line endings - helps with misconfigured git on windows/cygwin - readme update: announce Cygwin support - un-deprecate old plugin definition syntax: `set -g @tpm_plugins` +- More stuff, check `git log`. ### v3.0.0, 2015-08-03 - refactor `shared_set_tpm_path_constant` function From e504b8eec68b85e4e1562db756307446add3eff3 Mon Sep 17 00:00:00 2001 From: Franklin Yu Date: Thu, 5 Jan 2023 20:37:06 -0800 Subject: [PATCH 3/5] Show the output of Git pull when updating plugins This tells users whether a plugin changed during the update. --- scripts/update_plugin.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/scripts/update_plugin.sh b/scripts/update_plugin.sh index 68bf605..e533664 100755 --- a/scripts/update_plugin.sh +++ b/scripts/update_plugin.sh @@ -26,10 +26,15 @@ pull_changes() { } update() { - local plugin="$1" - $(pull_changes "$plugin" > /dev/null 2>&1) && - echo_ok " \"$plugin\" update success" || + local plugin="$1" output + output=$(pull_changes "$plugin" 2>&1) + if (( $? == 0 )); then + echo_ok " \"$plugin\" update success" + echo_ok "$(echo "$output" | sed -e 's/^/ | /')" + else echo_err " \"$plugin\" update fail" + echo_err "$(echo "$output" | sed -e 's/^/ | /')" + fi } update_all() { From 3709b62397a8f807ac5501a534d46dccb3b66fc2 Mon Sep 17 00:00:00 2001 From: Andy Richardson Date: Sun, 26 Feb 2023 19:18:12 +0000 Subject: [PATCH 4/5] Update tpm_not_working.md --- docs/tpm_not_working.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/tpm_not_working.md b/docs/tpm_not_working.md index bfa14ac..bd69536 100644 --- a/docs/tpm_not_working.md +++ b/docs/tpm_not_working.md @@ -85,12 +85,18 @@ find ~/.tmux -type d -name '.git*' -prune -o -type f -print0 | xargs -0 dos2unix Related: [issue #67](https://github.com/tmux-plugins/tpm/issues/67) -This problem is because tmux's `run-shell` command runs a shell which doesn't read from user configs, thus tmux installed in `/usr/local/bin` will not be found. +This problem is because tmux's `run-shell` command runs a shell which doesn't read from user configs, thus tmux installed in a brew prefix (e.g. `/usr/local/bin`) will not be found. -The solution is to insert the following line: +The solution is to find your brew prefix +```sh +> echo "$(brew --prefix)/bin" +/opt/homebrew/bin ``` -set-environment -g PATH "/usr/local/bin:/bin:/usr/bin" + +And prefix it to the `PATH` environment variable +``` +set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" ``` before any `run-shell`/`run` commands in `~/.tmux.conf`. From 8307a5fe5838b0704a20629638ecaf855c9a3731 Mon Sep 17 00:00:00 2001 From: Andy Richardson Date: Sun, 26 Feb 2023 19:21:30 +0000 Subject: [PATCH 5/5] prepend > prefix --- docs/tpm_not_working.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/tpm_not_working.md b/docs/tpm_not_working.md index bd69536..6680291 100644 --- a/docs/tpm_not_working.md +++ b/docs/tpm_not_working.md @@ -94,7 +94,7 @@ The solution is to find your brew prefix /opt/homebrew/bin ``` -And prefix it to the `PATH` environment variable +And prepend it to the `PATH` environment variable ``` set-environment -g PATH "/opt/homebrew/bin:/bin:/usr/bin" ```