From 1dcafb99ff91e5389263d6c59b7179fd5abef0a5 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 19 Jun 2016 19:33:15 +0200
Subject: main: drop "on-disk format" from -version output, add Go version

As v0.4 introduced ext4-style feature flags, the on-disk format version
is unlinkely to change. Drop it from the version output to reduce
clutter. Use "gocryptfs -version -debug" to see it.

Add the Go version string because only Go 1.6 and newer have an optimized
AES-GCM implementation. This will help users to understand the performance
of their build.
---
 main.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index b29b2f6..6467b4b 100644
--- a/main.go
+++ b/main.go
@@ -151,8 +151,8 @@ func changePassword(args *argContainer) {
 // printVersion - print a version string like
 // "gocryptfs v0.3.1-31-g6736212-dirty; on-disk format 2"
 func printVersion() {
-	fmt.Printf("%s %s; on-disk format %d; go-fuse %s\n",
-		tlog.ProgramName, GitVersion, contentenc.CurrentVersion, GitVersionFuse)
+	fmt.Printf("%s %s; go-fuse %s; %s\n",
+		tlog.ProgramName, GitVersion, GitVersionFuse, runtime.Version())
 }
 
 func main() {
@@ -218,6 +218,7 @@ func main() {
 	// "-v"
 	if args.version {
 		tlog.Debug.Printf("openssl=%v\n", args.openssl)
+		tlog.Debug.Printf("on-disk format %d\n", contentenc.CurrentVersion)
 		printVersion()
 		os.Exit(0)
 	}
-- 
cgit v1.2.3