selfupdate fix

wplib · Jun 12, 2020 · fc37add · fc37add
1 parent cf686af
commit fc37add
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 197 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/cmd/commands.go b/cmd/commands.go
@@ -4,6 +4,7 @@ import (
 	"github.com/newclarity/scribeHelpers/loadTools"
 	"github.com/newclarity/scribeHelpers/ux"
 	"github.com/spf13/cobra"
+	"github.com/wplib/deploywp/defaults"
 )
 
 const onlyOnce = "1"
@@ -13,20 +14,20 @@ var onlyTwice = []string{"", ""}
 func init() {
 	rootCmd.AddCommand(buildCmd)
 	rootCmd.AddCommand(convertCmd)
-	rootCmd.AddCommand(helpersCmd)
+	rootCmd.AddCommand(toolsCmd)
 	rootCmd.AddCommand(loadCmd)
 	rootCmd.AddCommand(runCmd)
 }
 
 
 var buildCmd = &cobra.Command{
 	Use:   loadTools.CmdBuild,
-	Short: ux.SprintfBlue("Build a Pantheon website."),
-	Long: ux.SprintfBlue("Build a Pantheon website."),
+	Short: ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Build a Pantheon website."),
+	Long: ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Build a Pantheon website."),
 	Run: cmdBuild,
 }
 
-var helpersCmd = &cobra.Command{
+var toolsCmd = &cobra.Command{
 	Use:   loadTools.CmdTools,
 	Short: ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
 	Long:  ux.SprintfMagenta("scribe") + ux.SprintfBlue(" - Show all built-in template helpers."),
@@ -55,8 +56,3 @@ For example: #!/usr/bin/env scribe --json gearbox.json run
 `),
 	Run: cmdRun,
 }
-
-
-func init() {
-	rootCmd.AddCommand(helpersCmd)
-}
diff --git a/cmd/runtime/structs.go b/cmd/runtime/structs.go
diff --git a/cmd/version.go b/cmd/version.go
@@ -20,9 +20,9 @@ var versionCmd = &cobra.Command{
 	Long:  ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Show version of executable."),
 	Run: func(cmd *cobra.Command, args []string) {
 		Cmd.State = ProcessArgs(Cmd, cmd, args)
-		if Cmd.State.IsNotOk() {
-			return
-		}
+		//if Cmd.State.IsNotOk() {
+		//	return
+		//}
 
 		Cmd.State = Version(args...)
 	},
@@ -33,9 +33,9 @@ var selfUpdateCmd = &cobra.Command{
 	Long: ux.SprintfMagenta(defaults.BinaryName) + ux.SprintfBlue(" - Check and update the latest version."),
 	Run: func(cmd *cobra.Command, args []string) {
 		Cmd.State = ProcessArgs(Cmd, cmd, args)
-		if Cmd.State.IsNotOk() {
-			return
-		}
+		//if Cmd.State.IsNotOk() {
+		//	return
+		//}
 
 		Cmd.State = VersionUpdate()
 	},

diff --git a/defaults/version.go b/defaults/version.go
@@ -2,7 +2,7 @@ package defaults
 
 const (
 	BinaryName = "deploywp"
-	BinaryVersion = "1.0.0"
+	BinaryVersion = "1.0.1"
 	SourceRepo = "github.com/wplib/deploywp"
 	BinaryRepo = "github.com/wplib/deploywp"
 )