Merge pull request #15 from owenthereal/add_default_flags

Add default flags to `candy setup`

Author: owenthereal

cmd/candy/cmd/launch_darwin.go

@@ -21,7 +21,7 @@ var launchCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(launchCmd)
-	addServerFlags(launchCmd)
+	addDefaultFlags(launchCmd)
 }
 
 func launchRunE(c *cobra.Command, args []string) error {

cmd/candy/cmd/run.go

@@ -31,10 +31,10 @@ var runCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(runCmd)
-	addServerFlags(runCmd)
+	addDefaultFlags(runCmd)
 }
 
-func addServerFlags(cmd *cobra.Command) {
+func addDefaultFlags(cmd *cobra.Command) {
 	cmd.Flags().String("host-root", filepath.Join(userHomeDir(), ".candy"), "Path to the directory containing applications that will be served by Candy")
 	cmd.Flags().StringSlice("domain", defaultDomains, "The top-level domains for which Candy will respond to DNS queries")
 	cmd.Flags().String("http-addr", ":28080", "The Proxy server HTTP address")

cmd/candy/cmd/setup_darwin.go

@@ -33,8 +33,7 @@ var setupCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(setupCmd)
-	setupCmd.Flags().StringSlice("domain", defaultDomains, "The top-level domains for which Candy will respond to DNS queries")
-	setupCmd.Flags().String("dns-addr", defaultDNSAddr, "The DNS server address")
+	addDefaultFlags(setupCmd)
 }
 
 func setupRunE(c *cobra.Command, args []string) error {