mirror of
				https://github.com/tmux-plugins/tpm.git
				synced 2025-11-04 08:36:05 +00:00 
			
		
		
		
	Use -g in new plugin definition syntax
				
					
				
			When tmux options are used without `-g` tmux complains on startup.
This commit is contained in:
		@@ -5,6 +5,7 @@
 | 
				
			|||||||
- start using `C-c` to clear screen
 | 
					- start using `C-c` to clear screen
 | 
				
			||||||
- add uninstall/clean procedure and keybinding (prefix+alt+u) (@chilicuil)
 | 
					- add uninstall/clean procedure and keybinding (prefix+alt+u) (@chilicuil)
 | 
				
			||||||
- add new `set @plugin 'repo'` plugin defintion syntax (@chilicuil)
 | 
					- add new `set @plugin 'repo'` plugin defintion syntax (@chilicuil)
 | 
				
			||||||
 | 
					- revert back to using `-g` flag in new plugin definition syntax
 | 
				
			||||||
 | 
					
 | 
				
			||||||
### v1.2.2, 2015-02-08
 | 
					### v1.2.2, 2015-02-08
 | 
				
			||||||
- set GIT_TERMINAL_PROMPT=0 when doing `git clone`, `pull` or `submodule update`
 | 
					- set GIT_TERMINAL_PROMPT=0 when doing `git clone`, `pull` or `submodule update`
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,7 @@ shared_get_tpm_plugins_list() {
 | 
				
			|||||||
	if [ -z "${plugins_list}" ]; then
 | 
						if [ -z "${plugins_list}" ]; then
 | 
				
			||||||
		#read set @plugin "tmux-plugins/tmux-example-plugin" entries
 | 
							#read set @plugin "tmux-plugins/tmux-example-plugin" entries
 | 
				
			||||||
		cat /etc/tmux.conf ~/.tmux.conf 2>/dev/null |
 | 
							cat /etc/tmux.conf ~/.tmux.conf 2>/dev/null |
 | 
				
			||||||
			awk '/^set +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $3 }'
 | 
								awk '/^set +-g +@plugin/ { gsub(/'\''/,""); gsub(/'\"'/,""); print $4 }'
 | 
				
			||||||
	else
 | 
						else
 | 
				
			||||||
		printf "%s\\n" "${plugins_list}"
 | 
							printf "%s\\n" "${plugins_list}"
 | 
				
			||||||
	fi
 | 
						fi
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -6,7 +6,7 @@ source $CURRENT_DIR/helpers.sh
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
test_plugin_installation() {
 | 
					test_plugin_installation() {
 | 
				
			||||||
	set_tmux_conf_helper <<- HERE
 | 
						set_tmux_conf_helper <<- HERE
 | 
				
			||||||
	set @plugin "tmux-plugins/tmux-example-plugin"
 | 
						set -g @plugin "tmux-plugins/tmux-example-plugin"
 | 
				
			||||||
	run-shell "$PWD/tpm"
 | 
						run-shell "$PWD/tpm"
 | 
				
			||||||
	HERE
 | 
						HERE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -23,8 +23,8 @@ test_plugin_installation() {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
test_multiple_plugins_installation() {
 | 
					test_multiple_plugins_installation() {
 | 
				
			||||||
	set_tmux_conf_helper <<- HERE
 | 
						set_tmux_conf_helper <<- HERE
 | 
				
			||||||
	set @plugin "tmux-plugins/tmux-example-plugin"
 | 
						set -g @plugin "tmux-plugins/tmux-example-plugin"
 | 
				
			||||||
	set   @plugin 'tmux-plugins/tmux-copycat'
 | 
						set  -g    @plugin 'tmux-plugins/tmux-copycat'
 | 
				
			||||||
	run-shell "$PWD/tpm"
 | 
						run-shell "$PWD/tpm"
 | 
				
			||||||
	HERE
 | 
						HERE
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user