Merge branch 'master' into patch-1

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

README.md

@@ -15,7 +15,7 @@ Requirements: `tmux` version 1.9 (or higher), `git`, `bash`.
 Clone TPM:
 
 ```bash
-$ git clone --depth=1 https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+git clone --depth=1 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

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 prepend 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`.

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() {