fix some mistake

fzerorubigd · Nov 6, 2014 · baa61ae · baa61ae
1 parent a6cdd9f
commit baa61ae
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 20 deletions.
diff --git a/tmass.go b/tmass.go
@@ -118,29 +118,14 @@ use --forcenew to overwrite this`,
 		},
 	}
 
-	// cobra has a bug with flags attache to root command, so add them twice here for dirty workaround
-	load.Flags().StringVar(
+	root.PersistentFlags().StringVar(
 		&tmuxCmd,
 		"tmux",
 		"tmux",
 		`The tmux command to use, just if tmux is not in the $PATH`,
 	)
 
-	load.Flags().StringVarP(
-		&layoutDir,
-		"layout-dir",
-		"l",
-		home+"/.config/tmass/",
-		`Layout directory, contain layout files`,
-	)
-	save.Flags().StringVar(
-		&tmuxCmd,
-		"tmux",
-		"tmux",
-		`The tmux command to use, just if tmux is not in the $PATH`,
-	)
-
-	save.Flags().StringVarP(
+	root.PersistentFlags().StringVarP(
 		&layoutDir,
 		"layout-dir",
 		"l",

diff --git a/tools/zsh_tmass b/tools/zsh_tmass
@@ -12,13 +12,14 @@ case "$state" in
 	   local commands; commands=(
 			 'load:Load a tmux session from a file'
 			 'save:Save current tmux session in a file'
+			 'help:Show help'
 		 )
 	  _describe -t commands 'command' commands && ret=0
 	  ;;
    (args)
 		local sec; sec=(
-			'--tmux:Tmux executable if its not in PATH or name is different from tmux'
-			'--layout-dir: layout directory to load/save from/to'
+			'--tmux=:Tmux executable if its not in PATH or name is different from tmux'
+			'--layout-dir=: layout directory to load/save from/to'
 		)
 
 		case "${line[1]}" in
@@ -31,7 +32,7 @@ case "$state" in
 			(load)
 				sec+=(
 					"--help: help on load"
-					"--forceneww: force a new session even if inside a tmux"
+					"--forcenew: force a new session even if inside a tmux"
 					"--rename: pick a new random name if the requested name is already used"
 				)
 				IFS=$'\n' sec+=($(ls ~/.config/tmass))