Check versions now only compares minor or above

Signed-off-by: Matt Stratton <[email protected]>

Author: mattstratton

commands/config.go

@@ -71,16 +71,15 @@ func checkHugo() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	fmt.Println("\u2713 Supported cli version is ", currentCliVersion)
 
-	if currentHugoVersion == getHugoVersion() {
+	if chompVersion(currentHugoVersion) == chompVersion(getHugoVersion()) {
 		color.Green("\u2713 Hugo version %s is okay", getHugoVersion())
 	} else {
 		color.Red("\u2717 Hugo version %s is incompatible.", getHugoVersion())
 		color.Red("Supported Version is: %s", currentHugoVersion)
 	}
 
-	if currentThemeVersion == getThemeVersion() {
+	if chompVersion(currentThemeVersion) == chompVersion(getThemeVersion()) {
 		color.Green("\u2713 Theme version %s is okay", getThemeVersion())
 	} else {
 		color.Red("\u2717 Theme version %s is incompatible.", getThemeVersion())
@@ -144,3 +143,10 @@ func checkGit() {
 		fmt.Println("\u2713 git is installed")
 	}
 }
+
+func compareVersion(currentVersion string, localVersion string) bool {
+	if chompVersion(currentVersion) == chompVersion(localVersion) {
+		return true
+	}
+	return false
+}

commands/version.go

@@ -55,7 +55,7 @@ func getHugoVersion() (hugoVersion string) {
 		log.Fatal(err)
 	}
 	s := string(out[:])
-	re := regexp.MustCompile("v....")
+	re := regexp.MustCompile("([0-9]\\.)\\w+")
 	hugoVersion = re.FindString(s)
 	return
 }
@@ -76,6 +76,10 @@ func getCliVersion() (cliVersion string) {
 	return Version
 }
 
+func chompVersion(version string) string {
+	return regexp.MustCompile("([0-9]\\.)\\w+").FindString(version)
+}
+
 // Theme represents the currently installed devopsdays-theme Hugo theme.
 // The field Version represents the current version.
 type Theme struct {