some fixes

Signed-off-by: Ashish Amarnath <ashish.amarnath@gmail.com>
kubernetes-retired · Jul 17, 2019 · 1b4c307 · 1b4c307
1 parent 02d3107
commit 1b4c307
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cmd/capdctl/main.go b/cmd/capdctl/main.go
@@ -153,7 +153,7 @@ func main() {
 		}
 		fmt.Fprint(os.Stdout, md)
 	case "version":
-		fmt.Println(versioninfo.VersionInfo(capdctl))
+		fmt.Print(versioninfo.VersionInfo(capdctl))
 	case "help":
 		fmt.Println(usage())
 	default:

diff --git a/hack/set-workspace-status.sh b/hack/set-workspace-status.sh
@@ -60,9 +60,7 @@ if GIT_VERSION=$(git describe --tags --abbrev=14 2>/dev/null); then
 
     # If GIT_VERSION is not a valid Semantic Version, then refuse to build.
     if ! [[ "${GIT_VERSION}" =~ ^v([0-9]+)\.([0-9]+)(\.[0-9]+)?(-[0-9A-Za-z.-]+)?(\+[0-9A-Za-z.-]+)?$ ]]; then
-        echo "GIT_VERSION should be a valid Semantic Version. Current value: ${GIT_VERSION}"
-        echo "Please see more details here: https://semver.org"
-        exit 1
+        GIT_VERSION=v0.0.0${GIT_VERSION}
     fi
 else
     GIT_VERSION="UNKNOWN_GIT_VERSION"