fix: file flag is no longer persistent

kldzj · May 7, 2023 · ad71af2 · ad71af2
1 parent 571eed0
commit ad71af2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/commands/copy.go b/commands/copy.go
@@ -34,7 +34,8 @@ func cmdCopyConfig() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().BoolP("force", "f", false, "overwrite existing file")
+	cmd.Flags().BoolP("force", "F", false, "overwrite existing file")
+	SetFileFlag(cmd)
 
 	return cmd
 }
diff --git a/commands/get.go b/commands/get.go
@@ -31,5 +31,7 @@ func cmdGet() *cobra.Command {
 		},
 	}
 
+	SetFileFlag(cmd)
+
 	return cmd
 }
diff --git a/commands/init.go b/commands/init.go
@@ -7,7 +7,13 @@ import (
 func Init(rootCmd *cobra.Command) {
 	rootCmd.AddCommand(cmdGet())
 	rootCmd.AddCommand(cmdSet())
-	rootCmd.AddCommand(cmdSetApiKey())
 	rootCmd.AddCommand(cmdCopyConfig())
+	rootCmd.AddCommand(cmdSetApiKey())
 	rootCmd.AddCommand(cmdUpdate())
 }
+
+func SetFileFlag(cmd *cobra.Command) {
+	cmd.Flags().StringP("file", "f", "", "server config file path")
+	cmd.MarkFlagFilename("file", "ini")
+	cmd.MarkFlagRequired("file")
+}
diff --git a/commands/set.go b/commands/set.go
@@ -65,6 +65,7 @@ func cmdSet() *cobra.Command {
 	}
 
 	cmd.Flags().BoolP("no-save", "n", false, "do not save to file")
+	SetFileFlag(cmd)
 
 	return cmd
 }

diff --git a/main.go b/main.go
@@ -37,10 +37,7 @@ pzmod --file server.ini set name "My Server"`,
 		},
 	}
 
-	rootCmd.PersistentFlags().StringP("file", "f", "", "server config file path")
-	rootCmd.MarkPersistentFlagFilename("file", "ini")
-	rootCmd.MarkPersistentFlagRequired("file")
-
+	commands.SetFileFlag(rootCmd)
 	commands.Init(rootCmd)
 	rootCmd.Execute()
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,5 +31,7 @@ func cmdGet() *cobra.Command { @@
     		},
     	}
+    	SetFileFlag(cmd)
     	return cmd
     }